diff --git a/data/chips/STM32C011D6.json b/data/chips/STM32C011D6.json
index a21c081..4fc43a1 100644
--- a/data/chips/STM32C011D6.json
+++ b/data/chips/STM32C011D6.json
@@ -121,7 +121,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C011F4.json b/data/chips/STM32C011F4.json
index 53cbeca..051c9df 100644
--- a/data/chips/STM32C011F4.json
+++ b/data/chips/STM32C011F4.json
@@ -125,7 +125,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C011F6.json b/data/chips/STM32C011F6.json
index 27990dc..57a398b 100644
--- a/data/chips/STM32C011F6.json
+++ b/data/chips/STM32C011F6.json
@@ -125,7 +125,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C011J4.json b/data/chips/STM32C011J4.json
index 6992aa1..f0a8e01 100644
--- a/data/chips/STM32C011J4.json
+++ b/data/chips/STM32C011J4.json
@@ -101,7 +101,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C011J6.json b/data/chips/STM32C011J6.json
index ceefdff..9e0b037 100644
--- a/data/chips/STM32C011J6.json
+++ b/data/chips/STM32C011J6.json
@@ -101,7 +101,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C031C4.json b/data/chips/STM32C031C4.json
index b6a90a1..b9ba442 100644
--- a/data/chips/STM32C031C4.json
+++ b/data/chips/STM32C031C4.json
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C031C6.json b/data/chips/STM32C031C6.json
index a01c2f4..d3310bd 100644
--- a/data/chips/STM32C031C6.json
+++ b/data/chips/STM32C031C6.json
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C031F4.json b/data/chips/STM32C031F4.json
index a529f3b..433b539 100644
--- a/data/chips/STM32C031F4.json
+++ b/data/chips/STM32C031F4.json
@@ -121,7 +121,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C031F6.json b/data/chips/STM32C031F6.json
index 5523813..f6f976e 100644
--- a/data/chips/STM32C031F6.json
+++ b/data/chips/STM32C031F6.json
@@ -121,7 +121,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C031G4.json b/data/chips/STM32C031G4.json
index 912a90b..1b223ae 100644
--- a/data/chips/STM32C031G4.json
+++ b/data/chips/STM32C031G4.json
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C031G6.json b/data/chips/STM32C031G6.json
index c483f69..4bcd19f 100644
--- a/data/chips/STM32C031G6.json
+++ b/data/chips/STM32C031G6.json
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C031K4.json b/data/chips/STM32C031K4.json
index 6035263..7b9df3c 100644
--- a/data/chips/STM32C031K4.json
+++ b/data/chips/STM32C031K4.json
@@ -137,7 +137,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32C031K6.json b/data/chips/STM32C031K6.json
index baf03fe..c1af982 100644
--- a/data/chips/STM32C031K6.json
+++ b/data/chips/STM32C031K6.json
@@ -137,7 +137,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F030C6.json b/data/chips/STM32F030C6.json
index 5fe2bbf..85a40e8 100644
--- a/data/chips/STM32F030C6.json
+++ b/data/chips/STM32F030C6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F030C8.json b/data/chips/STM32F030C8.json
index ba35401..eb1ff4a 100644
--- a/data/chips/STM32F030C8.json
+++ b/data/chips/STM32F030C8.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F030CC.json b/data/chips/STM32F030CC.json
index 8e12f37..70c21b0 100644
--- a/data/chips/STM32F030CC.json
+++ b/data/chips/STM32F030CC.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F030F4.json b/data/chips/STM32F030F4.json
index 3d8b893..7768e87 100644
--- a/data/chips/STM32F030F4.json
+++ b/data/chips/STM32F030F4.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -363,7 +363,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F030K6.json b/data/chips/STM32F030K6.json
index 1e42873..3ac158e 100644
--- a/data/chips/STM32F030K6.json
+++ b/data/chips/STM32F030K6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F030R8.json b/data/chips/STM32F030R8.json
index 5ffcd3e..042d14f 100644
--- a/data/chips/STM32F030R8.json
+++ b/data/chips/STM32F030R8.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -391,7 +391,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F030RC.json b/data/chips/STM32F030RC.json
index f8f7359..f08a6e5 100644
--- a/data/chips/STM32F030RC.json
+++ b/data/chips/STM32F030RC.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -393,7 +393,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031C4.json b/data/chips/STM32F031C4.json
index cad956c..346fc97 100644
--- a/data/chips/STM32F031C4.json
+++ b/data/chips/STM32F031C4.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031C6.json b/data/chips/STM32F031C6.json
index 3fe35e3..aee05dd 100644
--- a/data/chips/STM32F031C6.json
+++ b/data/chips/STM32F031C6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031E6.json b/data/chips/STM32F031E6.json
index 163bab6..92e6bd0 100644
--- a/data/chips/STM32F031E6.json
+++ b/data/chips/STM32F031E6.json
@@ -282,7 +282,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031F4.json b/data/chips/STM32F031F4.json
index a45d3ac..749acb5 100644
--- a/data/chips/STM32F031F4.json
+++ b/data/chips/STM32F031F4.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -363,7 +363,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031F6.json b/data/chips/STM32F031F6.json
index dbf9579..ff019b7 100644
--- a/data/chips/STM32F031F6.json
+++ b/data/chips/STM32F031F6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -363,7 +363,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031G4.json b/data/chips/STM32F031G4.json
index 0a0f0e0..1c22d8d 100644
--- a/data/chips/STM32F031G4.json
+++ b/data/chips/STM32F031G4.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031G6.json b/data/chips/STM32F031G6.json
index ce2e57e..de31ca6 100644
--- a/data/chips/STM32F031G6.json
+++ b/data/chips/STM32F031G6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031K4.json b/data/chips/STM32F031K4.json
index ad75c07..62e1d9b 100644
--- a/data/chips/STM32F031K4.json
+++ b/data/chips/STM32F031K4.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F031K6.json b/data/chips/STM32F031K6.json
index f31702f..23a42ea 100644
--- a/data/chips/STM32F031K6.json
+++ b/data/chips/STM32F031K6.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F038C6.json b/data/chips/STM32F038C6.json
index 6cd915c..c7c9e6e 100644
--- a/data/chips/STM32F038C6.json
+++ b/data/chips/STM32F038C6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F038E6.json b/data/chips/STM32F038E6.json
index 33153a5..850603b 100644
--- a/data/chips/STM32F038E6.json
+++ b/data/chips/STM32F038E6.json
@@ -282,7 +282,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F038F6.json b/data/chips/STM32F038F6.json
index 76329e7..cb787d1 100644
--- a/data/chips/STM32F038F6.json
+++ b/data/chips/STM32F038F6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -359,7 +359,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F038G6.json b/data/chips/STM32F038G6.json
index 273f3a4..0b553a1 100644
--- a/data/chips/STM32F038G6.json
+++ b/data/chips/STM32F038G6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -363,7 +363,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F038K6.json b/data/chips/STM32F038K6.json
index b510166..a0809e1 100644
--- a/data/chips/STM32F038K6.json
+++ b/data/chips/STM32F038K6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F042C4.json b/data/chips/STM32F042C4.json
index d170215..c051470 100644
--- a/data/chips/STM32F042C4.json
+++ b/data/chips/STM32F042C4.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -469,7 +469,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F042C6.json b/data/chips/STM32F042C6.json
index ee3d378..82228e8 100644
--- a/data/chips/STM32F042C6.json
+++ b/data/chips/STM32F042C6.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -469,7 +469,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F042F4.json b/data/chips/STM32F042F4.json
index 6c57713..3a2a747 100644
--- a/data/chips/STM32F042F4.json
+++ b/data/chips/STM32F042F4.json
@@ -300,7 +300,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -375,7 +375,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -456,7 +456,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F042F6.json b/data/chips/STM32F042F6.json
index e26256c..0e8eea1 100644
--- a/data/chips/STM32F042F6.json
+++ b/data/chips/STM32F042F6.json
@@ -300,7 +300,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -375,7 +375,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -456,7 +456,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F042G4.json b/data/chips/STM32F042G4.json
index eb274d6..47cffe4 100644
--- a/data/chips/STM32F042G4.json
+++ b/data/chips/STM32F042G4.json
@@ -300,7 +300,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -379,7 +379,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -460,7 +460,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F042G6.json b/data/chips/STM32F042G6.json
index 32a590a..af1e788 100644
--- a/data/chips/STM32F042G6.json
+++ b/data/chips/STM32F042G6.json
@@ -300,7 +300,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -379,7 +379,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -460,7 +460,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F042K4.json b/data/chips/STM32F042K4.json
index 7f6d027..005251b 100644
--- a/data/chips/STM32F042K4.json
+++ b/data/chips/STM32F042K4.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -464,7 +464,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F042K6.json b/data/chips/STM32F042K6.json
index 380f11c..18e5460 100644
--- a/data/chips/STM32F042K6.json
+++ b/data/chips/STM32F042K6.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -464,7 +464,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F042T6.json b/data/chips/STM32F042T6.json
index 52df8a2..9e2a4b2 100644
--- a/data/chips/STM32F042T6.json
+++ b/data/chips/STM32F042T6.json
@@ -300,7 +300,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -379,7 +379,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -460,7 +460,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F048C6.json b/data/chips/STM32F048C6.json
index 34e0168..8024ee8 100644
--- a/data/chips/STM32F048C6.json
+++ b/data/chips/STM32F048C6.json
@@ -294,7 +294,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -398,7 +398,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F048G6.json b/data/chips/STM32F048G6.json
index b26c5c4..4cd1e60 100644
--- a/data/chips/STM32F048G6.json
+++ b/data/chips/STM32F048G6.json
@@ -294,7 +294,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -394,7 +394,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F048T6.json b/data/chips/STM32F048T6.json
index b820e9f..10bc4bb 100644
--- a/data/chips/STM32F048T6.json
+++ b/data/chips/STM32F048T6.json
@@ -294,7 +294,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -398,7 +398,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F051C4.json b/data/chips/STM32F051C4.json
index 86ae98e..9cdc44c 100644
--- a/data/chips/STM32F051C4.json
+++ b/data/chips/STM32F051C4.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -396,7 +396,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051C6.json b/data/chips/STM32F051C6.json
index 47f60df..35c103d 100644
--- a/data/chips/STM32F051C6.json
+++ b/data/chips/STM32F051C6.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -396,7 +396,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051C8.json b/data/chips/STM32F051C8.json
index 61a6604..de64aa3 100644
--- a/data/chips/STM32F051C8.json
+++ b/data/chips/STM32F051C8.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -396,7 +396,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051K4.json b/data/chips/STM32F051K4.json
index 1c30013..2b4a572 100644
--- a/data/chips/STM32F051K4.json
+++ b/data/chips/STM32F051K4.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -396,7 +396,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051K6.json b/data/chips/STM32F051K6.json
index 352c4ff..1223cbc 100644
--- a/data/chips/STM32F051K6.json
+++ b/data/chips/STM32F051K6.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -396,7 +396,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051K8.json b/data/chips/STM32F051K8.json
index c1fe043..aa50bcd 100644
--- a/data/chips/STM32F051K8.json
+++ b/data/chips/STM32F051K8.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -396,7 +396,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051R4.json b/data/chips/STM32F051R4.json
index 4295c20..5bbc752 100644
--- a/data/chips/STM32F051R4.json
+++ b/data/chips/STM32F051R4.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -391,7 +391,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -416,7 +416,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051R6.json b/data/chips/STM32F051R6.json
index ecebd9b..292b9a6 100644
--- a/data/chips/STM32F051R6.json
+++ b/data/chips/STM32F051R6.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -391,7 +391,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -416,7 +416,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051R8.json b/data/chips/STM32F051R8.json
index aef1bbe..55c21ea 100644
--- a/data/chips/STM32F051R8.json
+++ b/data/chips/STM32F051R8.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -420,7 +420,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F051T8.json b/data/chips/STM32F051T8.json
index 9fc501d..384f3cf 100644
--- a/data/chips/STM32F051T8.json
+++ b/data/chips/STM32F051T8.json
@@ -282,7 +282,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -386,7 +386,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F058C8.json b/data/chips/STM32F058C8.json
index 11ea69a..8a2c4ba 100644
--- a/data/chips/STM32F058C8.json
+++ b/data/chips/STM32F058C8.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -367,7 +367,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -392,7 +392,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F058R8.json b/data/chips/STM32F058R8.json
index ba88b5e..5f51472 100644
--- a/data/chips/STM32F058R8.json
+++ b/data/chips/STM32F058R8.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -420,7 +420,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F058T8.json b/data/chips/STM32F058T8.json
index 5b74043..8225d6e 100644
--- a/data/chips/STM32F058T8.json
+++ b/data/chips/STM32F058T8.json
@@ -282,7 +282,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -386,7 +386,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F070C6.json b/data/chips/STM32F070C6.json
index 738e77e..4fd5dc1 100644
--- a/data/chips/STM32F070C6.json
+++ b/data/chips/STM32F070C6.json
@@ -294,7 +294,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F070CB.json b/data/chips/STM32F070CB.json
index 83bde5b..fd26600 100644
--- a/data/chips/STM32F070CB.json
+++ b/data/chips/STM32F070CB.json
@@ -294,7 +294,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F070F6.json b/data/chips/STM32F070F6.json
index 00f5a97..62fcdef 100644
--- a/data/chips/STM32F070F6.json
+++ b/data/chips/STM32F070F6.json
@@ -294,7 +294,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F070RB.json b/data/chips/STM32F070RB.json
index 85a6af8..4d5a4b9 100644
--- a/data/chips/STM32F070RB.json
+++ b/data/chips/STM32F070RB.json
@@ -294,7 +294,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -397,7 +397,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32F071C8.json b/data/chips/STM32F071C8.json
index d47b3dd..ee4de82 100644
--- a/data/chips/STM32F071C8.json
+++ b/data/chips/STM32F071C8.json
@@ -280,7 +280,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -359,7 +359,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -384,7 +384,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F071CB.json b/data/chips/STM32F071CB.json
index f341622..b4256e3 100644
--- a/data/chips/STM32F071CB.json
+++ b/data/chips/STM32F071CB.json
@@ -296,7 +296,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -375,7 +375,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -400,7 +400,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F071RB.json b/data/chips/STM32F071RB.json
index 4074f18..fd8fb94 100644
--- a/data/chips/STM32F071RB.json
+++ b/data/chips/STM32F071RB.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -391,7 +391,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -416,7 +416,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F071V8.json b/data/chips/STM32F071V8.json
index af686a7..c7f3ef9 100644
--- a/data/chips/STM32F071V8.json
+++ b/data/chips/STM32F071V8.json
@@ -286,7 +286,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -414,7 +414,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F071VB.json b/data/chips/STM32F071VB.json
index 142c041..d8f595c 100644
--- a/data/chips/STM32F071VB.json
+++ b/data/chips/STM32F071VB.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -420,7 +420,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F072C8.json b/data/chips/STM32F072C8.json
index 8eee354..4ee756f 100644
--- a/data/chips/STM32F072C8.json
+++ b/data/chips/STM32F072C8.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -469,7 +469,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F072CB.json b/data/chips/STM32F072CB.json
index ccb3620..3633fe6 100644
--- a/data/chips/STM32F072CB.json
+++ b/data/chips/STM32F072CB.json
@@ -308,7 +308,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -387,7 +387,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -473,7 +473,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F072R8.json b/data/chips/STM32F072R8.json
index 07355d5..37c5e51 100644
--- a/data/chips/STM32F072R8.json
+++ b/data/chips/STM32F072R8.json
@@ -300,7 +300,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -489,7 +489,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F072RB.json b/data/chips/STM32F072RB.json
index 96d17c0..585a063 100644
--- a/data/chips/STM32F072RB.json
+++ b/data/chips/STM32F072RB.json
@@ -308,7 +308,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -411,7 +411,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -497,7 +497,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F072V8.json b/data/chips/STM32F072V8.json
index f27e507..cc50b4c 100644
--- a/data/chips/STM32F072V8.json
+++ b/data/chips/STM32F072V8.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -407,7 +407,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -503,7 +503,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F072VB.json b/data/chips/STM32F072VB.json
index 5e432a2..ca4c589 100644
--- a/data/chips/STM32F072VB.json
+++ b/data/chips/STM32F072VB.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -407,7 +407,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -503,7 +503,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F078CB.json b/data/chips/STM32F078CB.json
index 514d2f8..fd49c18 100644
--- a/data/chips/STM32F078CB.json
+++ b/data/chips/STM32F078CB.json
@@ -308,7 +308,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -387,7 +387,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -412,7 +412,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F078RB.json b/data/chips/STM32F078RB.json
index a16ca44..dc95e6b 100644
--- a/data/chips/STM32F078RB.json
+++ b/data/chips/STM32F078RB.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -407,7 +407,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -432,7 +432,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F078VB.json b/data/chips/STM32F078VB.json
index 5b0944f..af69eee 100644
--- a/data/chips/STM32F078VB.json
+++ b/data/chips/STM32F078VB.json
@@ -304,7 +304,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -407,7 +407,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -432,7 +432,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F091CB.json b/data/chips/STM32F091CB.json
index 54af868..c1b8326 100644
--- a/data/chips/STM32F091CB.json
+++ b/data/chips/STM32F091CB.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -378,7 +378,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -464,7 +464,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F091CC.json b/data/chips/STM32F091CC.json
index f97ba06..51bff8f 100644
--- a/data/chips/STM32F091CC.json
+++ b/data/chips/STM32F091CC.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -378,7 +378,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -464,7 +464,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F091RB.json b/data/chips/STM32F091RB.json
index 530b272..2903db3 100644
--- a/data/chips/STM32F091RB.json
+++ b/data/chips/STM32F091RB.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -398,7 +398,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -484,7 +484,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F091RC.json b/data/chips/STM32F091RC.json
index 3b8e7b7..e10c34c 100644
--- a/data/chips/STM32F091RC.json
+++ b/data/chips/STM32F091RC.json
@@ -296,7 +296,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -406,7 +406,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -492,7 +492,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F091VB.json b/data/chips/STM32F091VB.json
index c8d64c1..32973e7 100644
--- a/data/chips/STM32F091VB.json
+++ b/data/chips/STM32F091VB.json
@@ -288,7 +288,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -398,7 +398,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -494,7 +494,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F091VC.json b/data/chips/STM32F091VC.json
index cb0e028..26b223a 100644
--- a/data/chips/STM32F091VC.json
+++ b/data/chips/STM32F091VC.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -402,7 +402,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -498,7 +498,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F098CC.json b/data/chips/STM32F098CC.json
index 04a160f..1b9e9e2 100644
--- a/data/chips/STM32F098CC.json
+++ b/data/chips/STM32F098CC.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -378,7 +378,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -464,7 +464,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F098RC.json b/data/chips/STM32F098RC.json
index cb923b6..971e7b0 100644
--- a/data/chips/STM32F098RC.json
+++ b/data/chips/STM32F098RC.json
@@ -296,7 +296,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -406,7 +406,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -492,7 +492,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F098VC.json b/data/chips/STM32F098VC.json
index fa7833b..938061b 100644
--- a/data/chips/STM32F098VC.json
+++ b/data/chips/STM32F098VC.json
@@ -292,7 +292,7 @@
             "name": "cm0",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -402,7 +402,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
@@ -498,7 +498,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC_CAN"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F100C4.json b/data/chips/STM32F100C4.json
index f074f41..56a0e47 100644
--- a/data/chips/STM32F100C4.json
+++ b/data/chips/STM32F100C4.json
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -409,7 +409,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100C6.json b/data/chips/STM32F100C6.json
index b413a37..737c0dd 100644
--- a/data/chips/STM32F100C6.json
+++ b/data/chips/STM32F100C6.json
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -409,7 +409,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100C8.json b/data/chips/STM32F100C8.json
index 70634f4..e355f6a 100644
--- a/data/chips/STM32F100C8.json
+++ b/data/chips/STM32F100C8.json
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -409,7 +409,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100CB.json b/data/chips/STM32F100CB.json
index 35f64d4..99398bd 100644
--- a/data/chips/STM32F100CB.json
+++ b/data/chips/STM32F100CB.json
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -409,7 +409,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100R4.json b/data/chips/STM32F100R4.json
index 2129d09..ddbf26c 100644
--- a/data/chips/STM32F100R4.json
+++ b/data/chips/STM32F100R4.json
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -437,7 +437,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100R6.json b/data/chips/STM32F100R6.json
index e615492..8405f05 100644
--- a/data/chips/STM32F100R6.json
+++ b/data/chips/STM32F100R6.json
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -437,7 +437,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100R8.json b/data/chips/STM32F100R8.json
index 570baaf..6dee35e 100644
--- a/data/chips/STM32F100R8.json
+++ b/data/chips/STM32F100R8.json
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -437,7 +437,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100RB.json b/data/chips/STM32F100RB.json
index f392a83..df2ebc9 100644
--- a/data/chips/STM32F100RB.json
+++ b/data/chips/STM32F100RB.json
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -437,7 +437,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100RC.json b/data/chips/STM32F100RC.json
index ec406a1..f9fe819 100644
--- a/data/chips/STM32F100RC.json
+++ b/data/chips/STM32F100RC.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100RD.json b/data/chips/STM32F100RD.json
index 8222cd1..6bbd93f 100644
--- a/data/chips/STM32F100RD.json
+++ b/data/chips/STM32F100RD.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100RE.json b/data/chips/STM32F100RE.json
index 1e2a721..fc09890 100644
--- a/data/chips/STM32F100RE.json
+++ b/data/chips/STM32F100RE.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100V8.json b/data/chips/STM32F100V8.json
index d52b91a..6058d3b 100644
--- a/data/chips/STM32F100V8.json
+++ b/data/chips/STM32F100V8.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100VB.json b/data/chips/STM32F100VB.json
index f806f3f..1b4d92e 100644
--- a/data/chips/STM32F100VB.json
+++ b/data/chips/STM32F100VB.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100VC.json b/data/chips/STM32F100VC.json
index c67185e..f35cdba 100644
--- a/data/chips/STM32F100VC.json
+++ b/data/chips/STM32F100VC.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100VD.json b/data/chips/STM32F100VD.json
index 6124fd8..b553b20 100644
--- a/data/chips/STM32F100VD.json
+++ b/data/chips/STM32F100VD.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100VE.json b/data/chips/STM32F100VE.json
index 2549fcd..f3fbe00 100644
--- a/data/chips/STM32F100VE.json
+++ b/data/chips/STM32F100VE.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100ZC.json b/data/chips/STM32F100ZC.json
index be264cd..0bb7f20 100644
--- a/data/chips/STM32F100ZC.json
+++ b/data/chips/STM32F100ZC.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100ZD.json b/data/chips/STM32F100ZD.json
index b75e99c..525cfe5 100644
--- a/data/chips/STM32F100ZD.json
+++ b/data/chips/STM32F100ZD.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F100ZE.json b/data/chips/STM32F100ZE.json
index 537e4c3..c4d05c4 100644
--- a/data/chips/STM32F100ZE.json
+++ b/data/chips/STM32F100ZE.json
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
@@ -433,7 +433,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F101C4.json b/data/chips/STM32F101C4.json
index 2cb1abd..be7538d 100644
--- a/data/chips/STM32F101C4.json
+++ b/data/chips/STM32F101C4.json
@@ -351,7 +351,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101C6.json b/data/chips/STM32F101C6.json
index de2dc94..99dc587 100644
--- a/data/chips/STM32F101C6.json
+++ b/data/chips/STM32F101C6.json
@@ -357,7 +357,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101C8.json b/data/chips/STM32F101C8.json
index 0ae03ee..025c2ee 100644
--- a/data/chips/STM32F101C8.json
+++ b/data/chips/STM32F101C8.json
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101CB.json b/data/chips/STM32F101CB.json
index e2c9756..3cd714f 100644
--- a/data/chips/STM32F101CB.json
+++ b/data/chips/STM32F101CB.json
@@ -355,7 +355,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101R4.json b/data/chips/STM32F101R4.json
index f88a45c..6dad5aa 100644
--- a/data/chips/STM32F101R4.json
+++ b/data/chips/STM32F101R4.json
@@ -381,7 +381,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101R6.json b/data/chips/STM32F101R6.json
index 3ee4ddc..f18879f 100644
--- a/data/chips/STM32F101R6.json
+++ b/data/chips/STM32F101R6.json
@@ -387,7 +387,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101R8.json b/data/chips/STM32F101R8.json
index d7bf755..17f906b 100644
--- a/data/chips/STM32F101R8.json
+++ b/data/chips/STM32F101R8.json
@@ -387,7 +387,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101RB.json b/data/chips/STM32F101RB.json
index 6b8288f..57b81ba 100644
--- a/data/chips/STM32F101RB.json
+++ b/data/chips/STM32F101RB.json
@@ -391,7 +391,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101RC.json b/data/chips/STM32F101RC.json
index cb844f0..dbf5184 100644
--- a/data/chips/STM32F101RC.json
+++ b/data/chips/STM32F101RC.json
@@ -393,7 +393,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101RD.json b/data/chips/STM32F101RD.json
index bf349b4..702a844 100644
--- a/data/chips/STM32F101RD.json
+++ b/data/chips/STM32F101RD.json
@@ -393,7 +393,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101RE.json b/data/chips/STM32F101RE.json
index 121bf85..e6ea7a1 100644
--- a/data/chips/STM32F101RE.json
+++ b/data/chips/STM32F101RE.json
@@ -393,7 +393,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101RF.json b/data/chips/STM32F101RF.json
index fdd51f4..eb5238c 100644
--- a/data/chips/STM32F101RF.json
+++ b/data/chips/STM32F101RF.json
@@ -410,7 +410,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101RG.json b/data/chips/STM32F101RG.json
index 9a156c5..82e34c7 100644
--- a/data/chips/STM32F101RG.json
+++ b/data/chips/STM32F101RG.json
@@ -392,7 +392,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101T4.json b/data/chips/STM32F101T4.json
index d5027d6..a26765d 100644
--- a/data/chips/STM32F101T4.json
+++ b/data/chips/STM32F101T4.json
@@ -351,7 +351,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101T6.json b/data/chips/STM32F101T6.json
index b948166..e769399 100644
--- a/data/chips/STM32F101T6.json
+++ b/data/chips/STM32F101T6.json
@@ -351,7 +351,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101T8.json b/data/chips/STM32F101T8.json
index 247cfbe..c343c12 100644
--- a/data/chips/STM32F101T8.json
+++ b/data/chips/STM32F101T8.json
@@ -357,7 +357,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101TB.json b/data/chips/STM32F101TB.json
index 5c3873c..bbfbc1f 100644
--- a/data/chips/STM32F101TB.json
+++ b/data/chips/STM32F101TB.json
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101V8.json b/data/chips/STM32F101V8.json
index 7ec8722..00bef3e 100644
--- a/data/chips/STM32F101V8.json
+++ b/data/chips/STM32F101V8.json
@@ -381,7 +381,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101VB.json b/data/chips/STM32F101VB.json
index 8bf7f1e..60902f0 100644
--- a/data/chips/STM32F101VB.json
+++ b/data/chips/STM32F101VB.json
@@ -381,7 +381,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101VC.json b/data/chips/STM32F101VC.json
index edc329a..7f1236f 100644
--- a/data/chips/STM32F101VC.json
+++ b/data/chips/STM32F101VC.json
@@ -387,7 +387,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101VD.json b/data/chips/STM32F101VD.json
index f86dcec..3169edc 100644
--- a/data/chips/STM32F101VD.json
+++ b/data/chips/STM32F101VD.json
@@ -387,7 +387,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101VE.json b/data/chips/STM32F101VE.json
index 4add321..b0f3ec7 100644
--- a/data/chips/STM32F101VE.json
+++ b/data/chips/STM32F101VE.json
@@ -381,7 +381,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101VF.json b/data/chips/STM32F101VF.json
index 444c356..0cf7c3f 100644
--- a/data/chips/STM32F101VF.json
+++ b/data/chips/STM32F101VF.json
@@ -386,7 +386,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101VG.json b/data/chips/STM32F101VG.json
index 8f3fe62..6e23a3f 100644
--- a/data/chips/STM32F101VG.json
+++ b/data/chips/STM32F101VG.json
@@ -386,7 +386,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101ZC.json b/data/chips/STM32F101ZC.json
index 0320944..6ef018d 100644
--- a/data/chips/STM32F101ZC.json
+++ b/data/chips/STM32F101ZC.json
@@ -381,7 +381,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101ZD.json b/data/chips/STM32F101ZD.json
index e5f560e..406f335 100644
--- a/data/chips/STM32F101ZD.json
+++ b/data/chips/STM32F101ZD.json
@@ -381,7 +381,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101ZE.json b/data/chips/STM32F101ZE.json
index f1df96a..bb8f239 100644
--- a/data/chips/STM32F101ZE.json
+++ b/data/chips/STM32F101ZE.json
@@ -381,7 +381,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101ZF.json b/data/chips/STM32F101ZF.json
index 5978c5f..9822c7e 100644
--- a/data/chips/STM32F101ZF.json
+++ b/data/chips/STM32F101ZF.json
@@ -362,7 +362,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F101ZG.json b/data/chips/STM32F101ZG.json
index 5cc0ca0..2464fee 100644
--- a/data/chips/STM32F101ZG.json
+++ b/data/chips/STM32F101ZG.json
@@ -386,7 +386,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F102C4.json b/data/chips/STM32F102C4.json
index 37796e3..79bb2d0 100644
--- a/data/chips/STM32F102C4.json
+++ b/data/chips/STM32F102C4.json
@@ -351,7 +351,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F102C6.json b/data/chips/STM32F102C6.json
index c0883bb..4ea76be 100644
--- a/data/chips/STM32F102C6.json
+++ b/data/chips/STM32F102C6.json
@@ -351,7 +351,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F102C8.json b/data/chips/STM32F102C8.json
index 61239ea..c63f826 100644
--- a/data/chips/STM32F102C8.json
+++ b/data/chips/STM32F102C8.json
@@ -351,7 +351,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F102CB.json b/data/chips/STM32F102CB.json
index 0e9eec0..20cb402 100644
--- a/data/chips/STM32F102CB.json
+++ b/data/chips/STM32F102CB.json
@@ -351,7 +351,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F102R4.json b/data/chips/STM32F102R4.json
index 03e8619..e9fa65d 100644
--- a/data/chips/STM32F102R4.json
+++ b/data/chips/STM32F102R4.json
@@ -375,7 +375,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F102R6.json b/data/chips/STM32F102R6.json
index 38847ae..6fc5175 100644
--- a/data/chips/STM32F102R6.json
+++ b/data/chips/STM32F102R6.json
@@ -375,7 +375,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F102R8.json b/data/chips/STM32F102R8.json
index c38dbd3..612a73c 100644
--- a/data/chips/STM32F102R8.json
+++ b/data/chips/STM32F102R8.json
@@ -375,7 +375,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F102RB.json b/data/chips/STM32F102RB.json
index 9e5e2e0..e591557 100644
--- a/data/chips/STM32F102RB.json
+++ b/data/chips/STM32F102RB.json
@@ -375,7 +375,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816576
                 },
                 {
diff --git a/data/chips/STM32F103C4.json b/data/chips/STM32F103C4.json
index 4a9f2ed..ce4869f 100644
--- a/data/chips/STM32F103C4.json
+++ b/data/chips/STM32F103C4.json
@@ -350,6 +350,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -419,10 +423,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103C6.json b/data/chips/STM32F103C6.json
index e639c56..96c1b6f 100644
--- a/data/chips/STM32F103C6.json
+++ b/data/chips/STM32F103C6.json
@@ -360,6 +360,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -429,10 +433,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103C8.json b/data/chips/STM32F103C8.json
index d66c04b..a32fe64 100644
--- a/data/chips/STM32F103C8.json
+++ b/data/chips/STM32F103C8.json
@@ -356,6 +356,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -425,10 +429,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103CB.json b/data/chips/STM32F103CB.json
index 108208a..dc5f072 100644
--- a/data/chips/STM32F103CB.json
+++ b/data/chips/STM32F103CB.json
@@ -354,6 +354,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -423,10 +427,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103R4.json b/data/chips/STM32F103R4.json
index 8f8736c..d4ed23e 100644
--- a/data/chips/STM32F103R4.json
+++ b/data/chips/STM32F103R4.json
@@ -378,6 +378,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -471,10 +475,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103R6.json b/data/chips/STM32F103R6.json
index ef1a36f..bebc156 100644
--- a/data/chips/STM32F103R6.json
+++ b/data/chips/STM32F103R6.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -477,10 +481,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103R8.json b/data/chips/STM32F103R8.json
index 7066d76..3496ae4 100644
--- a/data/chips/STM32F103R8.json
+++ b/data/chips/STM32F103R8.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -477,10 +481,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103RB.json b/data/chips/STM32F103RB.json
index ff64aed..16b495f 100644
--- a/data/chips/STM32F103RB.json
+++ b/data/chips/STM32F103RB.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -477,10 +481,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103RC.json b/data/chips/STM32F103RC.json
index cad61cd..86f540b 100644
--- a/data/chips/STM32F103RC.json
+++ b/data/chips/STM32F103RC.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -544,10 +548,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103RD.json b/data/chips/STM32F103RD.json
index facdc30..3af213e 100644
--- a/data/chips/STM32F103RD.json
+++ b/data/chips/STM32F103RD.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -544,10 +548,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103RE.json b/data/chips/STM32F103RE.json
index b17ce0c..3cf6093 100644
--- a/data/chips/STM32F103RE.json
+++ b/data/chips/STM32F103RE.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -544,10 +548,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103RF.json b/data/chips/STM32F103RF.json
index a3ed026..247ee3a 100644
--- a/data/chips/STM32F103RF.json
+++ b/data/chips/STM32F103RF.json
@@ -385,6 +385,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -545,10 +549,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103RG.json b/data/chips/STM32F103RG.json
index 9d6eeee..cfac187 100644
--- a/data/chips/STM32F103RG.json
+++ b/data/chips/STM32F103RG.json
@@ -385,6 +385,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -545,10 +549,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103T4.json b/data/chips/STM32F103T4.json
index 79eb364..abb070e 100644
--- a/data/chips/STM32F103T4.json
+++ b/data/chips/STM32F103T4.json
@@ -350,6 +350,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -419,10 +423,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103T6.json b/data/chips/STM32F103T6.json
index 35d6ef9..5d9b443 100644
--- a/data/chips/STM32F103T6.json
+++ b/data/chips/STM32F103T6.json
@@ -350,6 +350,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -419,10 +423,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103T8.json b/data/chips/STM32F103T8.json
index 2abd5f9..880b4fd 100644
--- a/data/chips/STM32F103T8.json
+++ b/data/chips/STM32F103T8.json
@@ -350,6 +350,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -419,10 +423,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103TB.json b/data/chips/STM32F103TB.json
index 5154f0e..77414ad 100644
--- a/data/chips/STM32F103TB.json
+++ b/data/chips/STM32F103TB.json
@@ -344,6 +344,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -413,10 +417,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103V8.json b/data/chips/STM32F103V8.json
index 08fe150..952fd22 100644
--- a/data/chips/STM32F103V8.json
+++ b/data/chips/STM32F103V8.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -477,10 +481,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103VB.json b/data/chips/STM32F103VB.json
index bbe573e..a4c50a2 100644
--- a/data/chips/STM32F103VB.json
+++ b/data/chips/STM32F103VB.json
@@ -388,6 +388,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -481,10 +485,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103VC.json b/data/chips/STM32F103VC.json
index 611f7ac..316adc6 100644
--- a/data/chips/STM32F103VC.json
+++ b/data/chips/STM32F103VC.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -544,10 +548,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103VD.json b/data/chips/STM32F103VD.json
index 939a80c..968b501 100644
--- a/data/chips/STM32F103VD.json
+++ b/data/chips/STM32F103VD.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -544,10 +548,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103VE.json b/data/chips/STM32F103VE.json
index 0af53ab..8180f35 100644
--- a/data/chips/STM32F103VE.json
+++ b/data/chips/STM32F103VE.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -544,10 +548,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103VF.json b/data/chips/STM32F103VF.json
index a44ebde..a26170e 100644
--- a/data/chips/STM32F103VF.json
+++ b/data/chips/STM32F103VF.json
@@ -385,6 +385,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -545,10 +549,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103VG.json b/data/chips/STM32F103VG.json
index 3480ef6..699cc22 100644
--- a/data/chips/STM32F103VG.json
+++ b/data/chips/STM32F103VG.json
@@ -385,6 +385,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -545,10 +549,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103ZC.json b/data/chips/STM32F103ZC.json
index cc47b97..93df622 100644
--- a/data/chips/STM32F103ZC.json
+++ b/data/chips/STM32F103ZC.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -564,10 +568,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103ZD.json b/data/chips/STM32F103ZD.json
index 03f56db..483f3b9 100644
--- a/data/chips/STM32F103ZD.json
+++ b/data/chips/STM32F103ZD.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -564,10 +568,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103ZE.json b/data/chips/STM32F103ZE.json
index 9afb9f0..ffb3a83 100644
--- a/data/chips/STM32F103ZE.json
+++ b/data/chips/STM32F103ZE.json
@@ -384,6 +384,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -564,10 +568,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103ZF.json b/data/chips/STM32F103ZF.json
index 172e576..c17af95 100644
--- a/data/chips/STM32F103ZF.json
+++ b/data/chips/STM32F103ZF.json
@@ -389,6 +389,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -569,10 +573,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F103ZG.json b/data/chips/STM32F103ZG.json
index 25e81e6..544f574 100644
--- a/data/chips/STM32F103ZG.json
+++ b/data/chips/STM32F103ZG.json
@@ -389,6 +389,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -569,10 +573,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F105R8.json b/data/chips/STM32F105R8.json
index 897c0f8..73eb7be 100644
--- a/data/chips/STM32F105R8.json
+++ b/data/chips/STM32F105R8.json
@@ -374,6 +374,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -467,10 +471,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F105RB.json b/data/chips/STM32F105RB.json
index 9542efb..4641f11 100644
--- a/data/chips/STM32F105RB.json
+++ b/data/chips/STM32F105RB.json
@@ -374,6 +374,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -467,10 +471,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F105RC.json b/data/chips/STM32F105RC.json
index 9b6c727..ac32018 100644
--- a/data/chips/STM32F105RC.json
+++ b/data/chips/STM32F105RC.json
@@ -374,6 +374,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -467,10 +471,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F105V8.json b/data/chips/STM32F105V8.json
index 7549bc8..dacbf18 100644
--- a/data/chips/STM32F105V8.json
+++ b/data/chips/STM32F105V8.json
@@ -378,6 +378,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -471,10 +475,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F105VB.json b/data/chips/STM32F105VB.json
index 66315cf..c77d405 100644
--- a/data/chips/STM32F105VB.json
+++ b/data/chips/STM32F105VB.json
@@ -378,6 +378,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -471,10 +475,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F105VC.json b/data/chips/STM32F105VC.json
index d627732..f57ce45 100644
--- a/data/chips/STM32F105VC.json
+++ b/data/chips/STM32F105VC.json
@@ -374,6 +374,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -467,10 +471,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F107RB.json b/data/chips/STM32F107RB.json
index 68c395a..79c0a48 100644
--- a/data/chips/STM32F107RB.json
+++ b/data/chips/STM32F107RB.json
@@ -374,6 +374,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -467,10 +471,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F107RC.json b/data/chips/STM32F107RC.json
index bda9991..723d7a8 100644
--- a/data/chips/STM32F107RC.json
+++ b/data/chips/STM32F107RC.json
@@ -374,6 +374,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -467,10 +471,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F107VB.json b/data/chips/STM32F107VB.json
index dee41b7..4f9a80a 100644
--- a/data/chips/STM32F107VB.json
+++ b/data/chips/STM32F107VB.json
@@ -374,6 +374,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -467,10 +471,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F107VC.json b/data/chips/STM32F107VC.json
index 1254009..e11ca9e 100644
--- a/data/chips/STM32F107VC.json
+++ b/data/chips/STM32F107VC.json
@@ -378,6 +378,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073816576
+                },
                 {
                     "name": "ADC2",
                     "address": 1073817600,
@@ -471,10 +475,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
-                },
                 {
                     "name": "AFIO",
                     "address": 1073807360,
diff --git a/data/chips/STM32F205RB.json b/data/chips/STM32F205RB.json
index 20a3a51..eb61de7 100644
--- a/data/chips/STM32F205RB.json
+++ b/data/chips/STM32F205RB.json
@@ -411,6 +411,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -581,15 +590,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205RC.json b/data/chips/STM32F205RC.json
index 08c7207..feb76a5 100644
--- a/data/chips/STM32F205RC.json
+++ b/data/chips/STM32F205RC.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205RE.json b/data/chips/STM32F205RE.json
index 58d55f2..2f59d2c 100644
--- a/data/chips/STM32F205RE.json
+++ b/data/chips/STM32F205RE.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -596,15 +605,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205RF.json b/data/chips/STM32F205RF.json
index ac3d0d3..029a0f9 100644
--- a/data/chips/STM32F205RF.json
+++ b/data/chips/STM32F205RF.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205RG.json b/data/chips/STM32F205RG.json
index cc84cab..0ca3998 100644
--- a/data/chips/STM32F205RG.json
+++ b/data/chips/STM32F205RG.json
@@ -430,6 +430,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -600,15 +609,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205VB.json b/data/chips/STM32F205VB.json
index 18a309a..6c124d2 100644
--- a/data/chips/STM32F205VB.json
+++ b/data/chips/STM32F205VB.json
@@ -411,6 +411,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -581,15 +590,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205VC.json b/data/chips/STM32F205VC.json
index 4f326c7..47dad7b 100644
--- a/data/chips/STM32F205VC.json
+++ b/data/chips/STM32F205VC.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205VE.json b/data/chips/STM32F205VE.json
index b7a0d7d..3f69791 100644
--- a/data/chips/STM32F205VE.json
+++ b/data/chips/STM32F205VE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205VF.json b/data/chips/STM32F205VF.json
index 3e62475..cdf8088 100644
--- a/data/chips/STM32F205VF.json
+++ b/data/chips/STM32F205VF.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205VG.json b/data/chips/STM32F205VG.json
index 96020c3..7a87e5a 100644
--- a/data/chips/STM32F205VG.json
+++ b/data/chips/STM32F205VG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205ZC.json b/data/chips/STM32F205ZC.json
index 1ff0b1e..6d6cee8 100644
--- a/data/chips/STM32F205ZC.json
+++ b/data/chips/STM32F205ZC.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205ZE.json b/data/chips/STM32F205ZE.json
index 596d158..2360d0e 100644
--- a/data/chips/STM32F205ZE.json
+++ b/data/chips/STM32F205ZE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205ZF.json b/data/chips/STM32F205ZF.json
index c164629..b675214 100644
--- a/data/chips/STM32F205ZF.json
+++ b/data/chips/STM32F205ZF.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F205ZG.json b/data/chips/STM32F205ZG.json
index fa04fae..57d12e5 100644
--- a/data/chips/STM32F205ZG.json
+++ b/data/chips/STM32F205ZG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207IC.json b/data/chips/STM32F207IC.json
index 42f207d..63df073 100644
--- a/data/chips/STM32F207IC.json
+++ b/data/chips/STM32F207IC.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -628,15 +637,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207IE.json b/data/chips/STM32F207IE.json
index 6f21e20..e375a39 100644
--- a/data/chips/STM32F207IE.json
+++ b/data/chips/STM32F207IE.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -628,15 +637,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207IF.json b/data/chips/STM32F207IF.json
index 7ca94a6..fe83d78 100644
--- a/data/chips/STM32F207IF.json
+++ b/data/chips/STM32F207IF.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -628,15 +637,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207IG.json b/data/chips/STM32F207IG.json
index 46b031f..db13254 100644
--- a/data/chips/STM32F207IG.json
+++ b/data/chips/STM32F207IG.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -628,15 +637,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207VC.json b/data/chips/STM32F207VC.json
index 11c2524..872ef1c 100644
--- a/data/chips/STM32F207VC.json
+++ b/data/chips/STM32F207VC.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207VE.json b/data/chips/STM32F207VE.json
index 551a7eb..a607ff7 100644
--- a/data/chips/STM32F207VE.json
+++ b/data/chips/STM32F207VE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207VF.json b/data/chips/STM32F207VF.json
index 5e4a2c5..b464f89 100644
--- a/data/chips/STM32F207VF.json
+++ b/data/chips/STM32F207VF.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207VG.json b/data/chips/STM32F207VG.json
index bffdc51..bb6e190 100644
--- a/data/chips/STM32F207VG.json
+++ b/data/chips/STM32F207VG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207ZC.json b/data/chips/STM32F207ZC.json
index 37e483f..859dda6 100644
--- a/data/chips/STM32F207ZC.json
+++ b/data/chips/STM32F207ZC.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207ZE.json b/data/chips/STM32F207ZE.json
index 9eccc8d..df4abf7 100644
--- a/data/chips/STM32F207ZE.json
+++ b/data/chips/STM32F207ZE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207ZF.json b/data/chips/STM32F207ZF.json
index 2a886cb..f98920b 100644
--- a/data/chips/STM32F207ZF.json
+++ b/data/chips/STM32F207ZF.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F207ZG.json b/data/chips/STM32F207ZG.json
index 6d1abe2..0b81ff4 100644
--- a/data/chips/STM32F207ZG.json
+++ b/data/chips/STM32F207ZG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F215RE.json b/data/chips/STM32F215RE.json
index ac43104..0fe81e9 100644
--- a/data/chips/STM32F215RE.json
+++ b/data/chips/STM32F215RE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F215RG.json b/data/chips/STM32F215RG.json
index 6259969..8328759 100644
--- a/data/chips/STM32F215RG.json
+++ b/data/chips/STM32F215RG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F215VE.json b/data/chips/STM32F215VE.json
index 01d5833..2c25481 100644
--- a/data/chips/STM32F215VE.json
+++ b/data/chips/STM32F215VE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F215VG.json b/data/chips/STM32F215VG.json
index 931755b..88944a5 100644
--- a/data/chips/STM32F215VG.json
+++ b/data/chips/STM32F215VG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F215ZE.json b/data/chips/STM32F215ZE.json
index 0d71505..a8b1447 100644
--- a/data/chips/STM32F215ZE.json
+++ b/data/chips/STM32F215ZE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F215ZG.json b/data/chips/STM32F215ZG.json
index d47eac0..1a1e462 100644
--- a/data/chips/STM32F215ZG.json
+++ b/data/chips/STM32F215ZG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F217IE.json b/data/chips/STM32F217IE.json
index b7529a8..ad2ea78 100644
--- a/data/chips/STM32F217IE.json
+++ b/data/chips/STM32F217IE.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -628,15 +637,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F217IG.json b/data/chips/STM32F217IG.json
index 6ffb5e7..cdd15fc 100644
--- a/data/chips/STM32F217IG.json
+++ b/data/chips/STM32F217IG.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -628,15 +637,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F217VE.json b/data/chips/STM32F217VE.json
index a5354ea..9f2cbc1 100644
--- a/data/chips/STM32F217VE.json
+++ b/data/chips/STM32F217VE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F217VG.json b/data/chips/STM32F217VG.json
index a1a621e..a59b565 100644
--- a/data/chips/STM32F217VG.json
+++ b/data/chips/STM32F217VG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F217ZE.json b/data/chips/STM32F217ZE.json
index 2a824b3..ac087e5 100644
--- a/data/chips/STM32F217ZE.json
+++ b/data/chips/STM32F217ZE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F217ZG.json b/data/chips/STM32F217ZG.json
index d6a9b98..8e17f69 100644
--- a/data/chips/STM32F217ZG.json
+++ b/data/chips/STM32F217ZG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -624,15 +633,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F301C6.json b/data/chips/STM32F301C6.json
index bc853dc..c7af3ea 100644
--- a/data/chips/STM32F301C6.json
+++ b/data/chips/STM32F301C6.json
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F301C8.json b/data/chips/STM32F301C8.json
index 6e002f6..2674131 100644
--- a/data/chips/STM32F301C8.json
+++ b/data/chips/STM32F301C8.json
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F301K6.json b/data/chips/STM32F301K6.json
index 0ccd1bd..8995f7b 100644
--- a/data/chips/STM32F301K6.json
+++ b/data/chips/STM32F301K6.json
@@ -357,7 +357,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F301K8.json b/data/chips/STM32F301K8.json
index 3bc382b..26e33dd 100644
--- a/data/chips/STM32F301K8.json
+++ b/data/chips/STM32F301K8.json
@@ -363,7 +363,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F301R6.json b/data/chips/STM32F301R6.json
index 3374044..0feed9a 100644
--- a/data/chips/STM32F301R6.json
+++ b/data/chips/STM32F301R6.json
@@ -377,7 +377,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F301R8.json b/data/chips/STM32F301R8.json
index ed6e066..096005f 100644
--- a/data/chips/STM32F301R8.json
+++ b/data/chips/STM32F301R8.json
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F302C6.json b/data/chips/STM32F302C6.json
index 799410d..8912ec9 100644
--- a/data/chips/STM32F302C6.json
+++ b/data/chips/STM32F302C6.json
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F302C8.json b/data/chips/STM32F302C8.json
index 158c440..96ec844 100644
--- a/data/chips/STM32F302C8.json
+++ b/data/chips/STM32F302C8.json
@@ -377,7 +377,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F302CB.json b/data/chips/STM32F302CB.json
index 06e55c1..e0668cf 100644
--- a/data/chips/STM32F302CB.json
+++ b/data/chips/STM32F302CB.json
@@ -356,6 +356,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -415,15 +424,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302CC.json b/data/chips/STM32F302CC.json
index 6770caf..8df08f1 100644
--- a/data/chips/STM32F302CC.json
+++ b/data/chips/STM32F302CC.json
@@ -356,6 +356,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -415,15 +424,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302K6.json b/data/chips/STM32F302K6.json
index c4d311a..f9005e6 100644
--- a/data/chips/STM32F302K6.json
+++ b/data/chips/STM32F302K6.json
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F302K8.json b/data/chips/STM32F302K8.json
index 6a3ca06..03f5f8c 100644
--- a/data/chips/STM32F302K8.json
+++ b/data/chips/STM32F302K8.json
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F302R6.json b/data/chips/STM32F302R6.json
index b57e549..be723ae 100644
--- a/data/chips/STM32F302R6.json
+++ b/data/chips/STM32F302R6.json
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F302R8.json b/data/chips/STM32F302R8.json
index 4e239b9..e55f744 100644
--- a/data/chips/STM32F302R8.json
+++ b/data/chips/STM32F302R8.json
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F302RB.json b/data/chips/STM32F302RB.json
index 5312941..c65f4d1 100644
--- a/data/chips/STM32F302RB.json
+++ b/data/chips/STM32F302RB.json
@@ -376,6 +376,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -459,15 +468,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302RC.json b/data/chips/STM32F302RC.json
index da9435f..1dbd75e 100644
--- a/data/chips/STM32F302RC.json
+++ b/data/chips/STM32F302RC.json
@@ -376,6 +376,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -459,15 +468,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302RD.json b/data/chips/STM32F302RD.json
index c0ce7ca..2dc818f 100644
--- a/data/chips/STM32F302RD.json
+++ b/data/chips/STM32F302RD.json
@@ -370,6 +370,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -457,15 +466,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302RE.json b/data/chips/STM32F302RE.json
index de8f1ec..db8ba76 100644
--- a/data/chips/STM32F302RE.json
+++ b/data/chips/STM32F302RE.json
@@ -370,6 +370,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -457,15 +466,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302VB.json b/data/chips/STM32F302VB.json
index 64fb3ee..7255a2c 100644
--- a/data/chips/STM32F302VB.json
+++ b/data/chips/STM32F302VB.json
@@ -380,6 +380,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -467,15 +476,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302VC.json b/data/chips/STM32F302VC.json
index 9618d6a..ca08a6d 100644
--- a/data/chips/STM32F302VC.json
+++ b/data/chips/STM32F302VC.json
@@ -384,6 +384,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -471,15 +480,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302VD.json b/data/chips/STM32F302VD.json
index 8387b7d..5074095 100644
--- a/data/chips/STM32F302VD.json
+++ b/data/chips/STM32F302VD.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -469,15 +478,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302VE.json b/data/chips/STM32F302VE.json
index 7f6c4ec..1095916 100644
--- a/data/chips/STM32F302VE.json
+++ b/data/chips/STM32F302VE.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -469,15 +478,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302ZD.json b/data/chips/STM32F302ZD.json
index e7b5097..a603c12 100644
--- a/data/chips/STM32F302ZD.json
+++ b/data/chips/STM32F302ZD.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -469,15 +478,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F302ZE.json b/data/chips/STM32F302ZE.json
index 4b6c0d4..47828d4 100644
--- a/data/chips/STM32F302ZE.json
+++ b/data/chips/STM32F302ZE.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -469,15 +478,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303C6.json b/data/chips/STM32F303C6.json
index 00d61b1..d2b15b7 100644
--- a/data/chips/STM32F303C6.json
+++ b/data/chips/STM32F303C6.json
@@ -372,6 +372,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -455,15 +464,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303C8.json b/data/chips/STM32F303C8.json
index 74dcb55..8996e3f 100644
--- a/data/chips/STM32F303C8.json
+++ b/data/chips/STM32F303C8.json
@@ -376,6 +376,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -459,15 +468,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303CB.json b/data/chips/STM32F303CB.json
index 107c5f7..aa03ee8 100644
--- a/data/chips/STM32F303CB.json
+++ b/data/chips/STM32F303CB.json
@@ -374,6 +374,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -481,7 +490,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -540,15 +549,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303CC.json b/data/chips/STM32F303CC.json
index 1b9b324..b53acc6 100644
--- a/data/chips/STM32F303CC.json
+++ b/data/chips/STM32F303CC.json
@@ -374,6 +374,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -481,7 +490,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -540,15 +549,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303K6.json b/data/chips/STM32F303K6.json
index 4264ae7..0ca2d55 100644
--- a/data/chips/STM32F303K6.json
+++ b/data/chips/STM32F303K6.json
@@ -368,6 +368,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -423,15 +432,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303K8.json b/data/chips/STM32F303K8.json
index 2df8a2c..54372f5 100644
--- a/data/chips/STM32F303K8.json
+++ b/data/chips/STM32F303K8.json
@@ -368,6 +368,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -423,15 +432,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303R6.json b/data/chips/STM32F303R6.json
index 8fff634..0ab4af6 100644
--- a/data/chips/STM32F303R6.json
+++ b/data/chips/STM32F303R6.json
@@ -384,6 +384,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -479,15 +488,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303R8.json b/data/chips/STM32F303R8.json
index 64cafb2..d04d3b0 100644
--- a/data/chips/STM32F303R8.json
+++ b/data/chips/STM32F303R8.json
@@ -384,6 +384,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -479,15 +488,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303RB.json b/data/chips/STM32F303RB.json
index 2f29b53..e7518b9 100644
--- a/data/chips/STM32F303RB.json
+++ b/data/chips/STM32F303RB.json
@@ -394,6 +394,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -525,7 +534,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -584,15 +593,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303RC.json b/data/chips/STM32F303RC.json
index bd61ecd..6b550f5 100644
--- a/data/chips/STM32F303RC.json
+++ b/data/chips/STM32F303RC.json
@@ -400,6 +400,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -531,7 +540,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -590,15 +599,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303RD.json b/data/chips/STM32F303RD.json
index 0776793..d654318 100644
--- a/data/chips/STM32F303RD.json
+++ b/data/chips/STM32F303RD.json
@@ -388,6 +388,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -523,7 +532,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -582,15 +591,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303RE.json b/data/chips/STM32F303RE.json
index fdae142..57cd1a2 100644
--- a/data/chips/STM32F303RE.json
+++ b/data/chips/STM32F303RE.json
@@ -388,6 +388,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -523,7 +532,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -582,15 +591,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303VB.json b/data/chips/STM32F303VB.json
index 52e7032..d6e25e4 100644
--- a/data/chips/STM32F303VB.json
+++ b/data/chips/STM32F303VB.json
@@ -398,6 +398,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -581,7 +590,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -680,15 +689,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303VC.json b/data/chips/STM32F303VC.json
index 2497081..419d919 100644
--- a/data/chips/STM32F303VC.json
+++ b/data/chips/STM32F303VC.json
@@ -402,6 +402,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -585,7 +594,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -684,15 +693,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303VD.json b/data/chips/STM32F303VD.json
index fd6aec0..9592d1b 100644
--- a/data/chips/STM32F303VD.json
+++ b/data/chips/STM32F303VD.json
@@ -396,6 +396,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -583,7 +592,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -682,15 +691,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303VE.json b/data/chips/STM32F303VE.json
index 3d26101..77b46d9 100644
--- a/data/chips/STM32F303VE.json
+++ b/data/chips/STM32F303VE.json
@@ -400,6 +400,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -587,7 +596,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -686,15 +695,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303ZD.json b/data/chips/STM32F303ZD.json
index 376a457..c96efd4 100644
--- a/data/chips/STM32F303ZD.json
+++ b/data/chips/STM32F303ZD.json
@@ -396,6 +396,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -583,7 +592,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -682,15 +691,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F303ZE.json b/data/chips/STM32F303ZE.json
index 123c92f..8fd8471 100644
--- a/data/chips/STM32F303ZE.json
+++ b/data/chips/STM32F303ZE.json
@@ -396,6 +396,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -583,7 +592,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -682,15 +691,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F318C8.json b/data/chips/STM32F318C8.json
index 8de8fea..e3ea7f2 100644
--- a/data/chips/STM32F318C8.json
+++ b/data/chips/STM32F318C8.json
@@ -365,7 +365,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F318K8.json b/data/chips/STM32F318K8.json
index 1a0ffd1..71e0be2 100644
--- a/data/chips/STM32F318K8.json
+++ b/data/chips/STM32F318K8.json
@@ -349,7 +349,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342178048,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F328C8.json b/data/chips/STM32F328C8.json
index de8dbcb..b726eb5 100644
--- a/data/chips/STM32F328C8.json
+++ b/data/chips/STM32F328C8.json
@@ -344,6 +344,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -411,15 +420,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F334C4.json b/data/chips/STM32F334C4.json
index fdd620d..95a8ee1 100644
--- a/data/chips/STM32F334C4.json
+++ b/data/chips/STM32F334C4.json
@@ -372,6 +372,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -455,15 +464,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F334C6.json b/data/chips/STM32F334C6.json
index 0b52aa8..e3399fc 100644
--- a/data/chips/STM32F334C6.json
+++ b/data/chips/STM32F334C6.json
@@ -372,6 +372,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -455,15 +464,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F334C8.json b/data/chips/STM32F334C8.json
index 1c02624..33ca977 100644
--- a/data/chips/STM32F334C8.json
+++ b/data/chips/STM32F334C8.json
@@ -376,6 +376,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -459,15 +468,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F334K4.json b/data/chips/STM32F334K4.json
index 30f993f..5c04086 100644
--- a/data/chips/STM32F334K4.json
+++ b/data/chips/STM32F334K4.json
@@ -368,6 +368,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -423,15 +432,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F334K6.json b/data/chips/STM32F334K6.json
index 5bf96f5..e8e1f65 100644
--- a/data/chips/STM32F334K6.json
+++ b/data/chips/STM32F334K6.json
@@ -368,6 +368,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -423,15 +432,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F334K8.json b/data/chips/STM32F334K8.json
index d2cb3b1..c20d1a7 100644
--- a/data/chips/STM32F334K8.json
+++ b/data/chips/STM32F334K8.json
@@ -368,6 +368,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -423,15 +432,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F334R6.json b/data/chips/STM32F334R6.json
index 0abd102..5023f5c 100644
--- a/data/chips/STM32F334R6.json
+++ b/data/chips/STM32F334R6.json
@@ -384,6 +384,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -479,15 +488,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F334R8.json b/data/chips/STM32F334R8.json
index 15ea73c..1c73b4c 100644
--- a/data/chips/STM32F334R8.json
+++ b/data/chips/STM32F334R8.json
@@ -384,6 +384,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -479,15 +488,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F358CC.json b/data/chips/STM32F358CC.json
index 4a3aeb0..27689b9 100644
--- a/data/chips/STM32F358CC.json
+++ b/data/chips/STM32F358CC.json
@@ -338,6 +338,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -441,7 +450,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -500,15 +509,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F358RC.json b/data/chips/STM32F358RC.json
index 8ca4e37..a924012 100644
--- a/data/chips/STM32F358RC.json
+++ b/data/chips/STM32F358RC.json
@@ -358,6 +358,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -485,7 +494,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -544,15 +553,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F358VC.json b/data/chips/STM32F358VC.json
index ab287fa..62f4026 100644
--- a/data/chips/STM32F358VC.json
+++ b/data/chips/STM32F358VC.json
@@ -362,6 +362,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -541,7 +550,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -640,15 +649,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F373C8.json b/data/chips/STM32F373C8.json
index 72ad5d9..23283f3 100644
--- a/data/chips/STM32F373C8.json
+++ b/data/chips/STM32F373C8.json
@@ -383,8 +383,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -469,7 +474,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F373CB.json b/data/chips/STM32F373CB.json
index 8fd9834..ef701af 100644
--- a/data/chips/STM32F373CB.json
+++ b/data/chips/STM32F373CB.json
@@ -383,8 +383,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -469,7 +474,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F373CC.json b/data/chips/STM32F373CC.json
index 02f61d8..38a72e3 100644
--- a/data/chips/STM32F373CC.json
+++ b/data/chips/STM32F373CC.json
@@ -383,8 +383,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -469,7 +474,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F373R8.json b/data/chips/STM32F373R8.json
index ee37722..98a56dc 100644
--- a/data/chips/STM32F373R8.json
+++ b/data/chips/STM32F373R8.json
@@ -411,8 +411,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -497,7 +502,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F373RB.json b/data/chips/STM32F373RB.json
index 646a5ee..ea27ddd 100644
--- a/data/chips/STM32F373RB.json
+++ b/data/chips/STM32F373RB.json
@@ -411,8 +411,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -497,7 +502,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F373RC.json b/data/chips/STM32F373RC.json
index a847e62..d32107d 100644
--- a/data/chips/STM32F373RC.json
+++ b/data/chips/STM32F373RC.json
@@ -411,8 +411,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -497,7 +502,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F373V8.json b/data/chips/STM32F373V8.json
index 25701ef..d1bb48a 100644
--- a/data/chips/STM32F373V8.json
+++ b/data/chips/STM32F373V8.json
@@ -415,8 +415,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -511,7 +516,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F373VB.json b/data/chips/STM32F373VB.json
index 71bde00..0e124d6 100644
--- a/data/chips/STM32F373VB.json
+++ b/data/chips/STM32F373VB.json
@@ -415,8 +415,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -511,7 +516,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F373VC.json b/data/chips/STM32F373VC.json
index 1592884..85942f1 100644
--- a/data/chips/STM32F373VC.json
+++ b/data/chips/STM32F373VC.json
@@ -415,8 +415,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -511,7 +516,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F378CC.json b/data/chips/STM32F378CC.json
index ab8d487..6b56be1 100644
--- a/data/chips/STM32F378CC.json
+++ b/data/chips/STM32F378CC.json
@@ -365,8 +365,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -451,7 +456,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F378RC.json b/data/chips/STM32F378RC.json
index ac08bfc..84a02bd 100644
--- a/data/chips/STM32F378RC.json
+++ b/data/chips/STM32F378RC.json
@@ -397,8 +397,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -483,7 +488,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F378VC.json b/data/chips/STM32F378VC.json
index ee5a598..1a802d0 100644
--- a/data/chips/STM32F378VC.json
+++ b/data/chips/STM32F378VC.json
@@ -397,8 +397,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073816576
+                    "name": "ADC1_COMMON",
+                    "address": 1073816576,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "CAN",
@@ -493,7 +498,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32F398VE.json b/data/chips/STM32F398VE.json
index e41cb38..8974bab 100644
--- a/data/chips/STM32F398VE.json
+++ b/data/chips/STM32F398VE.json
@@ -362,6 +362,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "f3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -545,7 +554,7 @@
                     ]
                 },
                 {
-                    "name": "ADC3_COMMON",
+                    "name": "ADC34_COMMON",
                     "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
@@ -644,15 +653,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "f3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN",
                     "address": 1073767424,
diff --git a/data/chips/STM32F401CB.json b/data/chips/STM32F401CB.json
index a42a78d..bdf4b33 100644
--- a/data/chips/STM32F401CB.json
+++ b/data/chips/STM32F401CB.json
@@ -392,7 +392,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401CC.json b/data/chips/STM32F401CC.json
index 2fc76f9..ee25375 100644
--- a/data/chips/STM32F401CC.json
+++ b/data/chips/STM32F401CC.json
@@ -407,7 +407,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401CD.json b/data/chips/STM32F401CD.json
index 3dd1723..4ddab8e 100644
--- a/data/chips/STM32F401CD.json
+++ b/data/chips/STM32F401CD.json
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401CE.json b/data/chips/STM32F401CE.json
index a63bcf6..1a11b4b 100644
--- a/data/chips/STM32F401CE.json
+++ b/data/chips/STM32F401CE.json
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401RB.json b/data/chips/STM32F401RB.json
index f758ef2..b3e1891 100644
--- a/data/chips/STM32F401RB.json
+++ b/data/chips/STM32F401RB.json
@@ -412,7 +412,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401RC.json b/data/chips/STM32F401RC.json
index 6b39c39..4dc36c8 100644
--- a/data/chips/STM32F401RC.json
+++ b/data/chips/STM32F401RC.json
@@ -423,7 +423,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401RD.json b/data/chips/STM32F401RD.json
index b05deb6..eefd298 100644
--- a/data/chips/STM32F401RD.json
+++ b/data/chips/STM32F401RD.json
@@ -423,7 +423,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401RE.json b/data/chips/STM32F401RE.json
index 40cbe38..86ae0d1 100644
--- a/data/chips/STM32F401RE.json
+++ b/data/chips/STM32F401RE.json
@@ -423,7 +423,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401VB.json b/data/chips/STM32F401VB.json
index 499b513..5e7a7ac 100644
--- a/data/chips/STM32F401VB.json
+++ b/data/chips/STM32F401VB.json
@@ -416,7 +416,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401VC.json b/data/chips/STM32F401VC.json
index b0592e9..61e4265 100644
--- a/data/chips/STM32F401VC.json
+++ b/data/chips/STM32F401VC.json
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401VD.json b/data/chips/STM32F401VD.json
index b7bc334..9fe71b1 100644
--- a/data/chips/STM32F401VD.json
+++ b/data/chips/STM32F401VD.json
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F401VE.json b/data/chips/STM32F401VE.json
index de59935..0ec533b 100644
--- a/data/chips/STM32F401VE.json
+++ b/data/chips/STM32F401VE.json
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F405OE.json b/data/chips/STM32F405OE.json
index 576304a..62333c8 100644
--- a/data/chips/STM32F405OE.json
+++ b/data/chips/STM32F405OE.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -576,15 +585,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F405OG.json b/data/chips/STM32F405OG.json
index c071c77..7db0bba 100644
--- a/data/chips/STM32F405OG.json
+++ b/data/chips/STM32F405OG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -576,15 +585,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F405RG.json b/data/chips/STM32F405RG.json
index 83fe60c..e102872 100644
--- a/data/chips/STM32F405RG.json
+++ b/data/chips/STM32F405RG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -604,15 +613,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F405VG.json b/data/chips/STM32F405VG.json
index 6abedc4..828a38b 100644
--- a/data/chips/STM32F405VG.json
+++ b/data/chips/STM32F405VG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -604,15 +613,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F405ZG.json b/data/chips/STM32F405ZG.json
index 38c8d43..980224f 100644
--- a/data/chips/STM32F405ZG.json
+++ b/data/chips/STM32F405ZG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F407IE.json b/data/chips/STM32F407IE.json
index c1aa25e..89c7b2e 100644
--- a/data/chips/STM32F407IE.json
+++ b/data/chips/STM32F407IE.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -652,15 +661,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F407IG.json b/data/chips/STM32F407IG.json
index c218fc9..94eace6 100644
--- a/data/chips/STM32F407IG.json
+++ b/data/chips/STM32F407IG.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -652,15 +661,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F407VE.json b/data/chips/STM32F407VE.json
index 95b036b..f45577d 100644
--- a/data/chips/STM32F407VE.json
+++ b/data/chips/STM32F407VE.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -616,15 +625,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F407VG.json b/data/chips/STM32F407VG.json
index a31c474..7e17eca 100644
--- a/data/chips/STM32F407VG.json
+++ b/data/chips/STM32F407VG.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -616,15 +625,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F407ZE.json b/data/chips/STM32F407ZE.json
index 1f77f4d..5b73244 100644
--- a/data/chips/STM32F407ZE.json
+++ b/data/chips/STM32F407ZE.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -648,15 +657,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F407ZG.json b/data/chips/STM32F407ZG.json
index ca4aea9..1c0e545 100644
--- a/data/chips/STM32F407ZG.json
+++ b/data/chips/STM32F407ZG.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -648,15 +657,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F410C8.json b/data/chips/STM32F410C8.json
index c4bce2f..2626107 100644
--- a/data/chips/STM32F410C8.json
+++ b/data/chips/STM32F410C8.json
@@ -363,7 +363,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F410CB.json b/data/chips/STM32F410CB.json
index fd37c85..24b2a0d 100644
--- a/data/chips/STM32F410CB.json
+++ b/data/chips/STM32F410CB.json
@@ -374,7 +374,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F410R8.json b/data/chips/STM32F410R8.json
index 28a2752..21891bb 100644
--- a/data/chips/STM32F410R8.json
+++ b/data/chips/STM32F410R8.json
@@ -387,7 +387,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F410RB.json b/data/chips/STM32F410RB.json
index a739d10..1dca34a 100644
--- a/data/chips/STM32F410RB.json
+++ b/data/chips/STM32F410RB.json
@@ -398,7 +398,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F410T8.json b/data/chips/STM32F410T8.json
index ae2d070..84e87e5 100644
--- a/data/chips/STM32F410T8.json
+++ b/data/chips/STM32F410T8.json
@@ -335,7 +335,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F410TB.json b/data/chips/STM32F410TB.json
index 73d9844..99c80d2 100644
--- a/data/chips/STM32F410TB.json
+++ b/data/chips/STM32F410TB.json
@@ -346,7 +346,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F411CC.json b/data/chips/STM32F411CC.json
index 197e198..ceb2c5f 100644
--- a/data/chips/STM32F411CC.json
+++ b/data/chips/STM32F411CC.json
@@ -397,7 +397,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F411CE.json b/data/chips/STM32F411CE.json
index a9b85c8..91edad9 100644
--- a/data/chips/STM32F411CE.json
+++ b/data/chips/STM32F411CE.json
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F411RC.json b/data/chips/STM32F411RC.json
index 1c6e66d..a00e40c 100644
--- a/data/chips/STM32F411RC.json
+++ b/data/chips/STM32F411RC.json
@@ -417,7 +417,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F411RE.json b/data/chips/STM32F411RE.json
index 537f4b1..f31c38a 100644
--- a/data/chips/STM32F411RE.json
+++ b/data/chips/STM32F411RE.json
@@ -423,7 +423,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F411VC.json b/data/chips/STM32F411VC.json
index 082f013..762a45e 100644
--- a/data/chips/STM32F411VC.json
+++ b/data/chips/STM32F411VC.json
@@ -421,7 +421,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F411VE.json b/data/chips/STM32F411VE.json
index 6803b67..d0eb461 100644
--- a/data/chips/STM32F411VE.json
+++ b/data/chips/STM32F411VE.json
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F412CE.json b/data/chips/STM32F412CE.json
index 0d46e89..adedc8d 100644
--- a/data/chips/STM32F412CE.json
+++ b/data/chips/STM32F412CE.json
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F412CG.json b/data/chips/STM32F412CG.json
index 5a6daa1..b221326 100644
--- a/data/chips/STM32F412CG.json
+++ b/data/chips/STM32F412CG.json
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F412RE.json b/data/chips/STM32F412RE.json
index 42d3359..69497db 100644
--- a/data/chips/STM32F412RE.json
+++ b/data/chips/STM32F412RE.json
@@ -431,7 +431,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F412RG.json b/data/chips/STM32F412RG.json
index ca38981..07f96fb 100644
--- a/data/chips/STM32F412RG.json
+++ b/data/chips/STM32F412RG.json
@@ -431,7 +431,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F412VE.json b/data/chips/STM32F412VE.json
index 1d45a7f..b34925c 100644
--- a/data/chips/STM32F412VE.json
+++ b/data/chips/STM32F412VE.json
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F412VG.json b/data/chips/STM32F412VG.json
index 2605cba..77fda7e 100644
--- a/data/chips/STM32F412VG.json
+++ b/data/chips/STM32F412VG.json
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F412ZE.json b/data/chips/STM32F412ZE.json
index b79add7..d7a0292 100644
--- a/data/chips/STM32F412ZE.json
+++ b/data/chips/STM32F412ZE.json
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F412ZG.json b/data/chips/STM32F412ZG.json
index 06d75d2..f28646c 100644
--- a/data/chips/STM32F412ZG.json
+++ b/data/chips/STM32F412ZG.json
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413CG.json b/data/chips/STM32F413CG.json
index 45edd8c..ab13f58 100644
--- a/data/chips/STM32F413CG.json
+++ b/data/chips/STM32F413CG.json
@@ -417,7 +417,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413CH.json b/data/chips/STM32F413CH.json
index a41a50e..b19ecb4 100644
--- a/data/chips/STM32F413CH.json
+++ b/data/chips/STM32F413CH.json
@@ -417,7 +417,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413MG.json b/data/chips/STM32F413MG.json
index dd2ed17..84013d3 100644
--- a/data/chips/STM32F413MG.json
+++ b/data/chips/STM32F413MG.json
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413MH.json b/data/chips/STM32F413MH.json
index c5e7cc1..2ee3850 100644
--- a/data/chips/STM32F413MH.json
+++ b/data/chips/STM32F413MH.json
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413RG.json b/data/chips/STM32F413RG.json
index 71b5e39..6939d57 100644
--- a/data/chips/STM32F413RG.json
+++ b/data/chips/STM32F413RG.json
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413RH.json b/data/chips/STM32F413RH.json
index dd4b921..c193c70 100644
--- a/data/chips/STM32F413RH.json
+++ b/data/chips/STM32F413RH.json
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413VG.json b/data/chips/STM32F413VG.json
index 170d2d2..3a12d80 100644
--- a/data/chips/STM32F413VG.json
+++ b/data/chips/STM32F413VG.json
@@ -445,7 +445,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413VH.json b/data/chips/STM32F413VH.json
index f4a149d..b3d0513 100644
--- a/data/chips/STM32F413VH.json
+++ b/data/chips/STM32F413VH.json
@@ -445,7 +445,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413ZG.json b/data/chips/STM32F413ZG.json
index 56d979a..1d3691c 100644
--- a/data/chips/STM32F413ZG.json
+++ b/data/chips/STM32F413ZG.json
@@ -445,7 +445,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F413ZH.json b/data/chips/STM32F413ZH.json
index 98baeb2..800e9f2 100644
--- a/data/chips/STM32F413ZH.json
+++ b/data/chips/STM32F413ZH.json
@@ -445,7 +445,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F415OG.json b/data/chips/STM32F415OG.json
index d7b0811..6f61851 100644
--- a/data/chips/STM32F415OG.json
+++ b/data/chips/STM32F415OG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -576,15 +585,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F415RG.json b/data/chips/STM32F415RG.json
index 71300cd..2ddf037 100644
--- a/data/chips/STM32F415RG.json
+++ b/data/chips/STM32F415RG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -604,15 +613,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F415VG.json b/data/chips/STM32F415VG.json
index c406b5e..f9517e8 100644
--- a/data/chips/STM32F415VG.json
+++ b/data/chips/STM32F415VG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -604,15 +613,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F415ZG.json b/data/chips/STM32F415ZG.json
index 57599c4..38e8536 100644
--- a/data/chips/STM32F415ZG.json
+++ b/data/chips/STM32F415ZG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F417IE.json b/data/chips/STM32F417IE.json
index 30c0fa1..380910e 100644
--- a/data/chips/STM32F417IE.json
+++ b/data/chips/STM32F417IE.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -652,15 +661,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F417IG.json b/data/chips/STM32F417IG.json
index 9a65545..36195f7 100644
--- a/data/chips/STM32F417IG.json
+++ b/data/chips/STM32F417IG.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -652,15 +661,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F417VE.json b/data/chips/STM32F417VE.json
index 191c2f1..7fcc0b3 100644
--- a/data/chips/STM32F417VE.json
+++ b/data/chips/STM32F417VE.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -616,15 +625,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F417VG.json b/data/chips/STM32F417VG.json
index 570c0f3..1bf1d71 100644
--- a/data/chips/STM32F417VG.json
+++ b/data/chips/STM32F417VG.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -616,15 +625,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F417ZE.json b/data/chips/STM32F417ZE.json
index fefa96a..5a2b797 100644
--- a/data/chips/STM32F417ZE.json
+++ b/data/chips/STM32F417ZE.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -648,15 +657,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F417ZG.json b/data/chips/STM32F417ZG.json
index e7fb15c..e37a4e4 100644
--- a/data/chips/STM32F417ZG.json
+++ b/data/chips/STM32F417ZG.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -648,15 +657,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F423CH.json b/data/chips/STM32F423CH.json
index 90dcc39..1fb84ac 100644
--- a/data/chips/STM32F423CH.json
+++ b/data/chips/STM32F423CH.json
@@ -417,7 +417,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F423MH.json b/data/chips/STM32F423MH.json
index 473108d..1f643a2 100644
--- a/data/chips/STM32F423MH.json
+++ b/data/chips/STM32F423MH.json
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F423RH.json b/data/chips/STM32F423RH.json
index 9789a94..d98bef5 100644
--- a/data/chips/STM32F423RH.json
+++ b/data/chips/STM32F423RH.json
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F423VH.json b/data/chips/STM32F423VH.json
index 968cbf4..60f2da1 100644
--- a/data/chips/STM32F423VH.json
+++ b/data/chips/STM32F423VH.json
@@ -445,7 +445,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F423ZH.json b/data/chips/STM32F423ZH.json
index a70017e..d369f5a 100644
--- a/data/chips/STM32F423ZH.json
+++ b/data/chips/STM32F423ZH.json
@@ -445,7 +445,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073816320,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32F427AG.json b/data/chips/STM32F427AG.json
index 6b60efe..b559f11 100644
--- a/data/chips/STM32F427AG.json
+++ b/data/chips/STM32F427AG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -626,15 +635,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F427AI.json b/data/chips/STM32F427AI.json
index f3a9012..e710f9b 100644
--- a/data/chips/STM32F427AI.json
+++ b/data/chips/STM32F427AI.json
@@ -473,6 +473,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -659,15 +668,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F427IG.json b/data/chips/STM32F427IG.json
index c7d8f28..a4f34e5 100644
--- a/data/chips/STM32F427IG.json
+++ b/data/chips/STM32F427IG.json
@@ -456,6 +456,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -658,15 +667,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F427II.json b/data/chips/STM32F427II.json
index abebc4c..1cc1955 100644
--- a/data/chips/STM32F427II.json
+++ b/data/chips/STM32F427II.json
@@ -489,6 +489,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -691,15 +700,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F427VG.json b/data/chips/STM32F427VG.json
index 2a200d5..6df4644 100644
--- a/data/chips/STM32F427VG.json
+++ b/data/chips/STM32F427VG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -622,15 +631,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F427VI.json b/data/chips/STM32F427VI.json
index 0b7e9e6..c3f6edd 100644
--- a/data/chips/STM32F427VI.json
+++ b/data/chips/STM32F427VI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -655,15 +664,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F427ZG.json b/data/chips/STM32F427ZG.json
index 783ff1b..8febcce 100644
--- a/data/chips/STM32F427ZG.json
+++ b/data/chips/STM32F427ZG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F427ZI.json b/data/chips/STM32F427ZI.json
index 795a775..cc2e15b 100644
--- a/data/chips/STM32F427ZI.json
+++ b/data/chips/STM32F427ZI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -687,15 +696,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429AG.json b/data/chips/STM32F429AG.json
index 476e996..9a74b7e 100644
--- a/data/chips/STM32F429AG.json
+++ b/data/chips/STM32F429AG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -638,15 +647,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429AI.json b/data/chips/STM32F429AI.json
index ede0bfa..19da96c 100644
--- a/data/chips/STM32F429AI.json
+++ b/data/chips/STM32F429AI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -671,15 +680,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429BE.json b/data/chips/STM32F429BE.json
index c2efa2b..e503afc 100644
--- a/data/chips/STM32F429BE.json
+++ b/data/chips/STM32F429BE.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429BG.json b/data/chips/STM32F429BG.json
index 8822c54..a839573 100644
--- a/data/chips/STM32F429BG.json
+++ b/data/chips/STM32F429BG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -660,15 +669,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429BI.json b/data/chips/STM32F429BI.json
index 5091ae4..c3e8b68 100644
--- a/data/chips/STM32F429BI.json
+++ b/data/chips/STM32F429BI.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -693,15 +702,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429IE.json b/data/chips/STM32F429IE.json
index 53a9f7e..53a3a7e 100644
--- a/data/chips/STM32F429IE.json
+++ b/data/chips/STM32F429IE.json
@@ -456,6 +456,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -658,15 +667,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429IG.json b/data/chips/STM32F429IG.json
index dcaf16c..cf8974e 100644
--- a/data/chips/STM32F429IG.json
+++ b/data/chips/STM32F429IG.json
@@ -468,6 +468,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -670,15 +679,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429II.json b/data/chips/STM32F429II.json
index 0f2886b..a2c86da 100644
--- a/data/chips/STM32F429II.json
+++ b/data/chips/STM32F429II.json
@@ -501,6 +501,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -703,15 +712,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429NE.json b/data/chips/STM32F429NE.json
index 6de9373..f83acf4 100644
--- a/data/chips/STM32F429NE.json
+++ b/data/chips/STM32F429NE.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429NG.json b/data/chips/STM32F429NG.json
index 86ec99c..d2eeae1 100644
--- a/data/chips/STM32F429NG.json
+++ b/data/chips/STM32F429NG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -660,15 +669,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429NI.json b/data/chips/STM32F429NI.json
index 6d58599..b8219da 100644
--- a/data/chips/STM32F429NI.json
+++ b/data/chips/STM32F429NI.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -693,15 +702,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429VE.json b/data/chips/STM32F429VE.json
index 9fead72..f62711b 100644
--- a/data/chips/STM32F429VE.json
+++ b/data/chips/STM32F429VE.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -622,15 +631,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429VG.json b/data/chips/STM32F429VG.json
index 3e5192d..7a94e16 100644
--- a/data/chips/STM32F429VG.json
+++ b/data/chips/STM32F429VG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -628,15 +637,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429VI.json b/data/chips/STM32F429VI.json
index 9ab9307..180c82d 100644
--- a/data/chips/STM32F429VI.json
+++ b/data/chips/STM32F429VI.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -661,15 +670,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429ZE.json b/data/chips/STM32F429ZE.json
index d056cf0..c311c8c 100644
--- a/data/chips/STM32F429ZE.json
+++ b/data/chips/STM32F429ZE.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429ZG.json b/data/chips/STM32F429ZG.json
index 0ed04cf..9ad044e 100644
--- a/data/chips/STM32F429ZG.json
+++ b/data/chips/STM32F429ZG.json
@@ -462,6 +462,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -664,15 +673,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F429ZI.json b/data/chips/STM32F429ZI.json
index 4eafde8..f10df55 100644
--- a/data/chips/STM32F429ZI.json
+++ b/data/chips/STM32F429ZI.json
@@ -495,6 +495,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -697,15 +706,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F437AI.json b/data/chips/STM32F437AI.json
index 37387fc..fd3369e 100644
--- a/data/chips/STM32F437AI.json
+++ b/data/chips/STM32F437AI.json
@@ -473,6 +473,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -659,15 +668,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F437IG.json b/data/chips/STM32F437IG.json
index 3187392..25448fe 100644
--- a/data/chips/STM32F437IG.json
+++ b/data/chips/STM32F437IG.json
@@ -456,6 +456,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -658,15 +667,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F437II.json b/data/chips/STM32F437II.json
index e5fe975..93ac8f1 100644
--- a/data/chips/STM32F437II.json
+++ b/data/chips/STM32F437II.json
@@ -489,6 +489,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -691,15 +700,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F437VG.json b/data/chips/STM32F437VG.json
index e496b64..edfdf1c 100644
--- a/data/chips/STM32F437VG.json
+++ b/data/chips/STM32F437VG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -622,15 +631,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F437VI.json b/data/chips/STM32F437VI.json
index c56f76b..f2efa2e 100644
--- a/data/chips/STM32F437VI.json
+++ b/data/chips/STM32F437VI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -655,15 +664,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F437ZG.json b/data/chips/STM32F437ZG.json
index 42cc4de..a62d2b7 100644
--- a/data/chips/STM32F437ZG.json
+++ b/data/chips/STM32F437ZG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F437ZI.json b/data/chips/STM32F437ZI.json
index 4b06cf9..d3de1f2 100644
--- a/data/chips/STM32F437ZI.json
+++ b/data/chips/STM32F437ZI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -687,15 +696,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439AI.json b/data/chips/STM32F439AI.json
index 93cb965..4a3fa55 100644
--- a/data/chips/STM32F439AI.json
+++ b/data/chips/STM32F439AI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -671,15 +680,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439BG.json b/data/chips/STM32F439BG.json
index c7c0548..203b82a 100644
--- a/data/chips/STM32F439BG.json
+++ b/data/chips/STM32F439BG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -660,15 +669,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439BI.json b/data/chips/STM32F439BI.json
index 7579bcf..9e71d41 100644
--- a/data/chips/STM32F439BI.json
+++ b/data/chips/STM32F439BI.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -693,15 +702,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439IG.json b/data/chips/STM32F439IG.json
index 54b3725..6a5a1c2 100644
--- a/data/chips/STM32F439IG.json
+++ b/data/chips/STM32F439IG.json
@@ -468,6 +468,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -670,15 +679,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439II.json b/data/chips/STM32F439II.json
index 3998d58..f08d97f 100644
--- a/data/chips/STM32F439II.json
+++ b/data/chips/STM32F439II.json
@@ -501,6 +501,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -703,15 +712,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439NG.json b/data/chips/STM32F439NG.json
index c7b0a8d..4f2b858 100644
--- a/data/chips/STM32F439NG.json
+++ b/data/chips/STM32F439NG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -660,15 +669,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439NI.json b/data/chips/STM32F439NI.json
index 7fff39b..339d730 100644
--- a/data/chips/STM32F439NI.json
+++ b/data/chips/STM32F439NI.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -693,15 +702,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439VG.json b/data/chips/STM32F439VG.json
index 7a1d73f..f8212d6 100644
--- a/data/chips/STM32F439VG.json
+++ b/data/chips/STM32F439VG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -628,15 +637,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439VI.json b/data/chips/STM32F439VI.json
index 9ad029f..f6d6cf5 100644
--- a/data/chips/STM32F439VI.json
+++ b/data/chips/STM32F439VI.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -661,15 +670,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439ZG.json b/data/chips/STM32F439ZG.json
index e33aa83..a2e3251 100644
--- a/data/chips/STM32F439ZG.json
+++ b/data/chips/STM32F439ZG.json
@@ -462,6 +462,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -664,15 +673,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F439ZI.json b/data/chips/STM32F439ZI.json
index 8bf13eb..96788ec 100644
--- a/data/chips/STM32F439ZI.json
+++ b/data/chips/STM32F439ZI.json
@@ -495,6 +495,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -697,15 +706,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F446MC.json b/data/chips/STM32F446MC.json
index 11f66b3..029d6c2 100644
--- a/data/chips/STM32F446MC.json
+++ b/data/chips/STM32F446MC.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -584,15 +593,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -743,7 +743,13 @@
                             "register": "APB1ENR",
                             "field": "CECEN"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F446ME.json b/data/chips/STM32F446ME.json
index 07664fe..44dd495 100644
--- a/data/chips/STM32F446ME.json
+++ b/data/chips/STM32F446ME.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -584,15 +593,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -743,7 +743,13 @@
                             "register": "APB1ENR",
                             "field": "CECEN"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F446RC.json b/data/chips/STM32F446RC.json
index e4a5fef..321e637 100644
--- a/data/chips/STM32F446RC.json
+++ b/data/chips/STM32F446RC.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -604,15 +613,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -753,7 +753,13 @@
                             "register": "APB1ENR",
                             "field": "CECEN"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F446RE.json b/data/chips/STM32F446RE.json
index 0fc3c10..fd50745 100644
--- a/data/chips/STM32F446RE.json
+++ b/data/chips/STM32F446RE.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -604,15 +613,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -753,7 +753,13 @@
                             "register": "APB1ENR",
                             "field": "CECEN"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F446VC.json b/data/chips/STM32F446VC.json
index a58d0dc..f96a3aa 100644
--- a/data/chips/STM32F446VC.json
+++ b/data/chips/STM32F446VC.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -604,15 +613,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -763,7 +763,13 @@
                             "register": "APB1ENR",
                             "field": "CECEN"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F446VE.json b/data/chips/STM32F446VE.json
index 2576571..98e101f 100644
--- a/data/chips/STM32F446VE.json
+++ b/data/chips/STM32F446VE.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -604,15 +613,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -763,7 +763,13 @@
                             "register": "APB1ENR",
                             "field": "CECEN"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F446ZC.json b/data/chips/STM32F446ZC.json
index 0c578ce..ba1b7bc 100644
--- a/data/chips/STM32F446ZC.json
+++ b/data/chips/STM32F446ZC.json
@@ -442,6 +442,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -644,15 +653,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -803,7 +803,13 @@
                             "register": "APB1ENR",
                             "field": "CECEN"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F446ZE.json b/data/chips/STM32F446ZE.json
index b296729..2274066 100644
--- a/data/chips/STM32F446ZE.json
+++ b/data/chips/STM32F446ZE.json
@@ -442,6 +442,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -644,15 +653,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -803,7 +803,13 @@
                             "register": "APB1ENR",
                             "field": "CECEN"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F469AE.json b/data/chips/STM32F469AE.json
index 6a78741..51bb451 100644
--- a/data/chips/STM32F469AE.json
+++ b/data/chips/STM32F469AE.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -602,15 +611,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469AG.json b/data/chips/STM32F469AG.json
index 42e6368..38d5691 100644
--- a/data/chips/STM32F469AG.json
+++ b/data/chips/STM32F469AG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -602,15 +611,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469AI.json b/data/chips/STM32F469AI.json
index da292b9..04280b1 100644
--- a/data/chips/STM32F469AI.json
+++ b/data/chips/STM32F469AI.json
@@ -473,6 +473,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -635,15 +644,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469BE.json b/data/chips/STM32F469BE.json
index dab6faf..6f8330d 100644
--- a/data/chips/STM32F469BE.json
+++ b/data/chips/STM32F469BE.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469BG.json b/data/chips/STM32F469BG.json
index 939757e..826cf41 100644
--- a/data/chips/STM32F469BG.json
+++ b/data/chips/STM32F469BG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469BI.json b/data/chips/STM32F469BI.json
index cb9ca33..a7f1b4f 100644
--- a/data/chips/STM32F469BI.json
+++ b/data/chips/STM32F469BI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -687,15 +696,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469IE.json b/data/chips/STM32F469IE.json
index 795a189..621c6d2 100644
--- a/data/chips/STM32F469IE.json
+++ b/data/chips/STM32F469IE.json
@@ -456,6 +456,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -658,15 +667,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469IG.json b/data/chips/STM32F469IG.json
index 9761a00..2fcfa40 100644
--- a/data/chips/STM32F469IG.json
+++ b/data/chips/STM32F469IG.json
@@ -456,6 +456,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -658,15 +667,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469II.json b/data/chips/STM32F469II.json
index 8721da9..01e523e 100644
--- a/data/chips/STM32F469II.json
+++ b/data/chips/STM32F469II.json
@@ -489,6 +489,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -691,15 +700,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469NE.json b/data/chips/STM32F469NE.json
index 75e87e2..095e947 100644
--- a/data/chips/STM32F469NE.json
+++ b/data/chips/STM32F469NE.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469NG.json b/data/chips/STM32F469NG.json
index 9af9898..fa291ba 100644
--- a/data/chips/STM32F469NG.json
+++ b/data/chips/STM32F469NG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469NI.json b/data/chips/STM32F469NI.json
index ebc6252..a3e7f98 100644
--- a/data/chips/STM32F469NI.json
+++ b/data/chips/STM32F469NI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -687,15 +696,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469VE.json b/data/chips/STM32F469VE.json
index c919c82..4959ff4 100644
--- a/data/chips/STM32F469VE.json
+++ b/data/chips/STM32F469VE.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -600,15 +609,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469VG.json b/data/chips/STM32F469VG.json
index 87a0b6c..63d4c07 100644
--- a/data/chips/STM32F469VG.json
+++ b/data/chips/STM32F469VG.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -600,15 +609,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469VI.json b/data/chips/STM32F469VI.json
index 3d38492..aa37c6d 100644
--- a/data/chips/STM32F469VI.json
+++ b/data/chips/STM32F469VI.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -633,15 +642,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469ZE.json b/data/chips/STM32F469ZE.json
index 7808b64..b0356c8 100644
--- a/data/chips/STM32F469ZE.json
+++ b/data/chips/STM32F469ZE.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -632,15 +641,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469ZG.json b/data/chips/STM32F469ZG.json
index 89078ee..18b2434 100644
--- a/data/chips/STM32F469ZG.json
+++ b/data/chips/STM32F469ZG.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -632,15 +641,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F469ZI.json b/data/chips/STM32F469ZI.json
index f6b3d18..1ece7bf 100644
--- a/data/chips/STM32F469ZI.json
+++ b/data/chips/STM32F469ZI.json
@@ -479,6 +479,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -665,15 +674,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479AG.json b/data/chips/STM32F479AG.json
index 977bd75..88915e3 100644
--- a/data/chips/STM32F479AG.json
+++ b/data/chips/STM32F479AG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -602,15 +611,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479AI.json b/data/chips/STM32F479AI.json
index 1012093..e0f632b 100644
--- a/data/chips/STM32F479AI.json
+++ b/data/chips/STM32F479AI.json
@@ -473,6 +473,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -635,15 +644,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479BG.json b/data/chips/STM32F479BG.json
index 434224a..0ca4edb 100644
--- a/data/chips/STM32F479BG.json
+++ b/data/chips/STM32F479BG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479BI.json b/data/chips/STM32F479BI.json
index 1f4daec..ba18a97 100644
--- a/data/chips/STM32F479BI.json
+++ b/data/chips/STM32F479BI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -687,15 +696,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479IG.json b/data/chips/STM32F479IG.json
index 98d2e9c..bfc3ea7 100644
--- a/data/chips/STM32F479IG.json
+++ b/data/chips/STM32F479IG.json
@@ -456,6 +456,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -658,15 +667,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479II.json b/data/chips/STM32F479II.json
index 964b8b1..7f5abbe 100644
--- a/data/chips/STM32F479II.json
+++ b/data/chips/STM32F479II.json
@@ -489,6 +489,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -691,15 +700,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479NG.json b/data/chips/STM32F479NG.json
index 9f17c5c..01cbf14 100644
--- a/data/chips/STM32F479NG.json
+++ b/data/chips/STM32F479NG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479NI.json b/data/chips/STM32F479NI.json
index 82b05b2..00b3d2d 100644
--- a/data/chips/STM32F479NI.json
+++ b/data/chips/STM32F479NI.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -687,15 +696,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479VG.json b/data/chips/STM32F479VG.json
index e615d5b..8e3f552 100644
--- a/data/chips/STM32F479VG.json
+++ b/data/chips/STM32F479VG.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -600,15 +609,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479VI.json b/data/chips/STM32F479VI.json
index e7efd75..67131e6 100644
--- a/data/chips/STM32F479VI.json
+++ b/data/chips/STM32F479VI.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -633,15 +642,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479ZG.json b/data/chips/STM32F479ZG.json
index 0e79285..1151a72 100644
--- a/data/chips/STM32F479ZG.json
+++ b/data/chips/STM32F479ZG.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -632,15 +641,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F479ZI.json b/data/chips/STM32F479ZI.json
index aa487e7..62b93c1 100644
--- a/data/chips/STM32F479ZI.json
+++ b/data/chips/STM32F479ZI.json
@@ -479,6 +479,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -665,15 +674,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F722IC.json b/data/chips/STM32F722IC.json
index f119bc5..067b5f5 100644
--- a/data/chips/STM32F722IC.json
+++ b/data/chips/STM32F722IC.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F722IE.json b/data/chips/STM32F722IE.json
index ae86a52..63fbce3 100644
--- a/data/chips/STM32F722IE.json
+++ b/data/chips/STM32F722IE.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F722RC.json b/data/chips/STM32F722RC.json
index a0a66eb..61b0eee 100644
--- a/data/chips/STM32F722RC.json
+++ b/data/chips/STM32F722RC.json
@@ -424,6 +424,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -590,15 +599,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F722RE.json b/data/chips/STM32F722RE.json
index 0099de5..4bd8d02 100644
--- a/data/chips/STM32F722RE.json
+++ b/data/chips/STM32F722RE.json
@@ -424,6 +424,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -590,15 +599,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F722VC.json b/data/chips/STM32F722VC.json
index 51512ed..2569c80 100644
--- a/data/chips/STM32F722VC.json
+++ b/data/chips/STM32F722VC.json
@@ -428,6 +428,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -598,15 +607,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F722VE.json b/data/chips/STM32F722VE.json
index acda677..d4a1088 100644
--- a/data/chips/STM32F722VE.json
+++ b/data/chips/STM32F722VE.json
@@ -428,6 +428,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -598,15 +607,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F722ZC.json b/data/chips/STM32F722ZC.json
index c1806e9..988c0c0 100644
--- a/data/chips/STM32F722ZC.json
+++ b/data/chips/STM32F722ZC.json
@@ -428,6 +428,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -630,15 +639,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F722ZE.json b/data/chips/STM32F722ZE.json
index 947dde0..62ee832 100644
--- a/data/chips/STM32F722ZE.json
+++ b/data/chips/STM32F722ZE.json
@@ -428,6 +428,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -630,15 +639,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F723IC.json b/data/chips/STM32F723IC.json
index 1463256..a1698ad 100644
--- a/data/chips/STM32F723IC.json
+++ b/data/chips/STM32F723IC.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F723IE.json b/data/chips/STM32F723IE.json
index 7f7e536..73b62d9 100644
--- a/data/chips/STM32F723IE.json
+++ b/data/chips/STM32F723IE.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F723VC.json b/data/chips/STM32F723VC.json
index a1340a8..666be12 100644
--- a/data/chips/STM32F723VC.json
+++ b/data/chips/STM32F723VC.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -602,15 +611,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F723VE.json b/data/chips/STM32F723VE.json
index 5979b7b..f1d2e39 100644
--- a/data/chips/STM32F723VE.json
+++ b/data/chips/STM32F723VE.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -602,15 +611,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F723ZC.json b/data/chips/STM32F723ZC.json
index 6c0129a..86beb02 100644
--- a/data/chips/STM32F723ZC.json
+++ b/data/chips/STM32F723ZC.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F723ZE.json b/data/chips/STM32F723ZE.json
index 837ce08..8bf880f 100644
--- a/data/chips/STM32F723ZE.json
+++ b/data/chips/STM32F723ZE.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32F730I8.json b/data/chips/STM32F730I8.json
index ff1d35e..64c87cc 100644
--- a/data/chips/STM32F730I8.json
+++ b/data/chips/STM32F730I8.json
@@ -394,6 +394,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -596,15 +605,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F730R8.json b/data/chips/STM32F730R8.json
index 11a6544..1582cf8 100644
--- a/data/chips/STM32F730R8.json
+++ b/data/chips/STM32F730R8.json
@@ -390,6 +390,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -556,15 +565,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F730V8.json b/data/chips/STM32F730V8.json
index 54bda17..10cd338 100644
--- a/data/chips/STM32F730V8.json
+++ b/data/chips/STM32F730V8.json
@@ -394,6 +394,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -564,15 +573,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F730Z8.json b/data/chips/STM32F730Z8.json
index e1dd10c..d4bc4ce 100644
--- a/data/chips/STM32F730Z8.json
+++ b/data/chips/STM32F730Z8.json
@@ -394,6 +394,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -596,15 +605,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F732IE.json b/data/chips/STM32F732IE.json
index 46a12b9..202cb0c 100644
--- a/data/chips/STM32F732IE.json
+++ b/data/chips/STM32F732IE.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F732RE.json b/data/chips/STM32F732RE.json
index 75cc0aa..167374d 100644
--- a/data/chips/STM32F732RE.json
+++ b/data/chips/STM32F732RE.json
@@ -424,6 +424,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -590,15 +599,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F732VE.json b/data/chips/STM32F732VE.json
index 8678a04..a4927ef 100644
--- a/data/chips/STM32F732VE.json
+++ b/data/chips/STM32F732VE.json
@@ -428,6 +428,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -598,15 +607,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F732ZE.json b/data/chips/STM32F732ZE.json
index 46f948b..b89e9e6 100644
--- a/data/chips/STM32F732ZE.json
+++ b/data/chips/STM32F732ZE.json
@@ -428,6 +428,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -630,15 +639,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F733IE.json b/data/chips/STM32F733IE.json
index 3f9f546..1f3bb7b 100644
--- a/data/chips/STM32F733IE.json
+++ b/data/chips/STM32F733IE.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F733VE.json b/data/chips/STM32F733VE.json
index da08e09..8f26fa3 100644
--- a/data/chips/STM32F733VE.json
+++ b/data/chips/STM32F733VE.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -602,15 +611,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F733ZE.json b/data/chips/STM32F733ZE.json
index a4fbdc9..2b1016d 100644
--- a/data/chips/STM32F733ZE.json
+++ b/data/chips/STM32F733ZE.json
@@ -432,6 +432,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -634,15 +643,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32F745IE.json b/data/chips/STM32F745IE.json
index 85bbebe..03d9ff9 100644
--- a/data/chips/STM32F745IE.json
+++ b/data/chips/STM32F745IE.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -640,15 +649,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -813,7 +813,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F745IG.json b/data/chips/STM32F745IG.json
index 6b61b42..251f487 100644
--- a/data/chips/STM32F745IG.json
+++ b/data/chips/STM32F745IG.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -640,15 +649,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -813,7 +813,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F745VE.json b/data/chips/STM32F745VE.json
index 97720df..f09fdad 100644
--- a/data/chips/STM32F745VE.json
+++ b/data/chips/STM32F745VE.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -608,15 +617,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -771,7 +771,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F745VG.json b/data/chips/STM32F745VG.json
index d196204..dca43ad 100644
--- a/data/chips/STM32F745VG.json
+++ b/data/chips/STM32F745VG.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -608,15 +617,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -771,7 +771,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F745ZE.json b/data/chips/STM32F745ZE.json
index 4f7d741..b4093b7 100644
--- a/data/chips/STM32F745ZE.json
+++ b/data/chips/STM32F745ZE.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -799,7 +799,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F745ZG.json b/data/chips/STM32F745ZG.json
index 6fdc485..41144bf 100644
--- a/data/chips/STM32F745ZG.json
+++ b/data/chips/STM32F745ZG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -799,7 +799,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746BE.json b/data/chips/STM32F746BE.json
index 68531d9..ab7cd04 100644
--- a/data/chips/STM32F746BE.json
+++ b/data/chips/STM32F746BE.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -815,7 +815,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746BG.json b/data/chips/STM32F746BG.json
index 439f65f..98d7866 100644
--- a/data/chips/STM32F746BG.json
+++ b/data/chips/STM32F746BG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -815,7 +815,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746IE.json b/data/chips/STM32F746IE.json
index 816367d..e04c738 100644
--- a/data/chips/STM32F746IE.json
+++ b/data/chips/STM32F746IE.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -646,15 +655,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -819,7 +819,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746IG.json b/data/chips/STM32F746IG.json
index ed8e155..1e088b1 100644
--- a/data/chips/STM32F746IG.json
+++ b/data/chips/STM32F746IG.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -646,15 +655,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -819,7 +819,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746NE.json b/data/chips/STM32F746NE.json
index 2282d2c..951a120 100644
--- a/data/chips/STM32F746NE.json
+++ b/data/chips/STM32F746NE.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -815,7 +815,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746NG.json b/data/chips/STM32F746NG.json
index 0421e4a..a1408be 100644
--- a/data/chips/STM32F746NG.json
+++ b/data/chips/STM32F746NG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -815,7 +815,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746VE.json b/data/chips/STM32F746VE.json
index ab73c1e..f294097 100644
--- a/data/chips/STM32F746VE.json
+++ b/data/chips/STM32F746VE.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -614,15 +623,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -777,7 +777,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746VG.json b/data/chips/STM32F746VG.json
index 8b02aee..afdad89 100644
--- a/data/chips/STM32F746VG.json
+++ b/data/chips/STM32F746VG.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -614,15 +623,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -777,7 +777,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746ZE.json b/data/chips/STM32F746ZE.json
index c9ef4b4..3e2a67b 100644
--- a/data/chips/STM32F746ZE.json
+++ b/data/chips/STM32F746ZE.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -646,15 +655,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -809,7 +809,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F746ZG.json b/data/chips/STM32F746ZG.json
index 0ab43b4..748d64b 100644
--- a/data/chips/STM32F746ZG.json
+++ b/data/chips/STM32F746ZG.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -646,15 +655,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -809,7 +809,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F750N8.json b/data/chips/STM32F750N8.json
index cc50c36..5e60a2f 100644
--- a/data/chips/STM32F750N8.json
+++ b/data/chips/STM32F750N8.json
@@ -394,6 +394,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -596,15 +605,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -769,7 +769,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F750V8.json b/data/chips/STM32F750V8.json
index 46e27ed..dab4018 100644
--- a/data/chips/STM32F750V8.json
+++ b/data/chips/STM32F750V8.json
@@ -394,6 +394,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -564,15 +573,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -727,7 +727,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F750Z8.json b/data/chips/STM32F750Z8.json
index 28d43e8..4bf0ce2 100644
--- a/data/chips/STM32F750Z8.json
+++ b/data/chips/STM32F750Z8.json
@@ -394,6 +394,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -596,15 +605,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -759,7 +759,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F756BG.json b/data/chips/STM32F756BG.json
index 3483b69..c003b35 100644
--- a/data/chips/STM32F756BG.json
+++ b/data/chips/STM32F756BG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -815,7 +815,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F756IG.json b/data/chips/STM32F756IG.json
index e642841..745fbaf 100644
--- a/data/chips/STM32F756IG.json
+++ b/data/chips/STM32F756IG.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -646,15 +655,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -819,7 +819,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F756NG.json b/data/chips/STM32F756NG.json
index af4c2cc..e82e107 100644
--- a/data/chips/STM32F756NG.json
+++ b/data/chips/STM32F756NG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -815,7 +815,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F756VG.json b/data/chips/STM32F756VG.json
index 01ee22d..d0c4cf6 100644
--- a/data/chips/STM32F756VG.json
+++ b/data/chips/STM32F756VG.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -614,15 +623,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -777,7 +777,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F756ZG.json b/data/chips/STM32F756ZG.json
index e815c8d..aa47935 100644
--- a/data/chips/STM32F756ZG.json
+++ b/data/chips/STM32F756ZG.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -646,15 +655,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -809,7 +809,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765BG.json b/data/chips/STM32F765BG.json
index 2ba24ae..26630c8 100644
--- a/data/chips/STM32F765BG.json
+++ b/data/chips/STM32F765BG.json
@@ -428,6 +428,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -630,15 +639,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -869,7 +869,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765BI.json b/data/chips/STM32F765BI.json
index 6679474..7c4719c 100644
--- a/data/chips/STM32F765BI.json
+++ b/data/chips/STM32F765BI.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -875,7 +875,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765IG.json b/data/chips/STM32F765IG.json
index 5666ef3..a68e039 100644
--- a/data/chips/STM32F765IG.json
+++ b/data/chips/STM32F765IG.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -640,15 +649,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -879,7 +879,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765II.json b/data/chips/STM32F765II.json
index 691c336..b853f3b 100644
--- a/data/chips/STM32F765II.json
+++ b/data/chips/STM32F765II.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -640,15 +649,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -879,7 +879,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765NG.json b/data/chips/STM32F765NG.json
index 51b5c6b..37aa6cf 100644
--- a/data/chips/STM32F765NG.json
+++ b/data/chips/STM32F765NG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -875,7 +875,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765NI.json b/data/chips/STM32F765NI.json
index d2cb1dd..c843b49 100644
--- a/data/chips/STM32F765NI.json
+++ b/data/chips/STM32F765NI.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -875,7 +875,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765VG.json b/data/chips/STM32F765VG.json
index 97de7d1..2710cfd 100644
--- a/data/chips/STM32F765VG.json
+++ b/data/chips/STM32F765VG.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -608,15 +617,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -832,7 +832,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765VI.json b/data/chips/STM32F765VI.json
index 646dd3a..11b30a8 100644
--- a/data/chips/STM32F765VI.json
+++ b/data/chips/STM32F765VI.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -608,15 +617,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -832,7 +832,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765ZG.json b/data/chips/STM32F765ZG.json
index 452300f..e0e55ee 100644
--- a/data/chips/STM32F765ZG.json
+++ b/data/chips/STM32F765ZG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -860,7 +860,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F765ZI.json b/data/chips/STM32F765ZI.json
index 7720f0b..3e1b05d 100644
--- a/data/chips/STM32F765ZI.json
+++ b/data/chips/STM32F765ZI.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -636,15 +645,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -860,7 +860,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767BG.json b/data/chips/STM32F767BG.json
index 9ac40fc..3ccb0c0 100644
--- a/data/chips/STM32F767BG.json
+++ b/data/chips/STM32F767BG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -881,7 +881,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767BI.json b/data/chips/STM32F767BI.json
index 53cfb9c..0d872f6 100644
--- a/data/chips/STM32F767BI.json
+++ b/data/chips/STM32F767BI.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -881,7 +881,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767IG.json b/data/chips/STM32F767IG.json
index 9bfa69f..a0d43bf 100644
--- a/data/chips/STM32F767IG.json
+++ b/data/chips/STM32F767IG.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -646,15 +655,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -885,7 +885,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767II.json b/data/chips/STM32F767II.json
index 566c82b..a22fbfa 100644
--- a/data/chips/STM32F767II.json
+++ b/data/chips/STM32F767II.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -646,15 +655,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -885,7 +885,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767NG.json b/data/chips/STM32F767NG.json
index f0201ce..733be6e 100644
--- a/data/chips/STM32F767NG.json
+++ b/data/chips/STM32F767NG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -881,7 +881,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767NI.json b/data/chips/STM32F767NI.json
index cfab1e8..1e710d4 100644
--- a/data/chips/STM32F767NI.json
+++ b/data/chips/STM32F767NI.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -881,7 +881,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767VG.json b/data/chips/STM32F767VG.json
index f8abf7f..c04a7d0 100644
--- a/data/chips/STM32F767VG.json
+++ b/data/chips/STM32F767VG.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -614,15 +623,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -838,7 +838,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767VI.json b/data/chips/STM32F767VI.json
index 0250470..1f607d8 100644
--- a/data/chips/STM32F767VI.json
+++ b/data/chips/STM32F767VI.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -614,15 +623,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -838,7 +838,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767ZG.json b/data/chips/STM32F767ZG.json
index 201ac21..442087a 100644
--- a/data/chips/STM32F767ZG.json
+++ b/data/chips/STM32F767ZG.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -866,7 +866,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F767ZI.json b/data/chips/STM32F767ZI.json
index 1275073..3f32711 100644
--- a/data/chips/STM32F767ZI.json
+++ b/data/chips/STM32F767ZI.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -642,15 +651,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -866,7 +866,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F768AI.json b/data/chips/STM32F768AI.json
index 864bca9..1e68e67 100644
--- a/data/chips/STM32F768AI.json
+++ b/data/chips/STM32F768AI.json
@@ -147,6 +147,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -309,15 +318,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -548,7 +548,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F769AG.json b/data/chips/STM32F769AG.json
index 588d7e9..ae75e04 100644
--- a/data/chips/STM32F769AG.json
+++ b/data/chips/STM32F769AG.json
@@ -147,6 +147,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -309,15 +318,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -548,7 +548,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F769AI.json b/data/chips/STM32F769AI.json
index 2973c12..12d204a 100644
--- a/data/chips/STM32F769AI.json
+++ b/data/chips/STM32F769AI.json
@@ -436,6 +436,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -598,15 +607,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -837,7 +837,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F769BG.json b/data/chips/STM32F769BG.json
index e940387..ae486a8 100644
--- a/data/chips/STM32F769BG.json
+++ b/data/chips/STM32F769BG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -893,7 +893,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F769BI.json b/data/chips/STM32F769BI.json
index 941a136..4bca7d0 100644
--- a/data/chips/STM32F769BI.json
+++ b/data/chips/STM32F769BI.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -893,7 +893,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F769IG.json b/data/chips/STM32F769IG.json
index cb40beb..5e1427f 100644
--- a/data/chips/STM32F769IG.json
+++ b/data/chips/STM32F769IG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -883,7 +883,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F769II.json b/data/chips/STM32F769II.json
index 58a464a..dcd2201 100644
--- a/data/chips/STM32F769II.json
+++ b/data/chips/STM32F769II.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -883,7 +883,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F769NG.json b/data/chips/STM32F769NG.json
index 763c171..92514a8 100644
--- a/data/chips/STM32F769NG.json
+++ b/data/chips/STM32F769NG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -893,7 +893,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F769NI.json b/data/chips/STM32F769NI.json
index bac8a34..3ddfce5 100644
--- a/data/chips/STM32F769NI.json
+++ b/data/chips/STM32F769NI.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -893,7 +893,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F777BI.json b/data/chips/STM32F777BI.json
index dffddca..3a51f35 100644
--- a/data/chips/STM32F777BI.json
+++ b/data/chips/STM32F777BI.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -648,15 +657,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -887,7 +887,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F777II.json b/data/chips/STM32F777II.json
index 125f27e..8a8572a 100644
--- a/data/chips/STM32F777II.json
+++ b/data/chips/STM32F777II.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -652,15 +661,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -891,7 +891,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F777NI.json b/data/chips/STM32F777NI.json
index 5b0bff4..8be66a4 100644
--- a/data/chips/STM32F777NI.json
+++ b/data/chips/STM32F777NI.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -648,15 +657,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -887,7 +887,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F777VI.json b/data/chips/STM32F777VI.json
index 077a30f..2b05484 100644
--- a/data/chips/STM32F777VI.json
+++ b/data/chips/STM32F777VI.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -620,15 +629,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -844,7 +844,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F777ZI.json b/data/chips/STM32F777ZI.json
index e428d0f..b305485 100644
--- a/data/chips/STM32F777ZI.json
+++ b/data/chips/STM32F777ZI.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -648,15 +657,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -872,7 +872,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F778AI.json b/data/chips/STM32F778AI.json
index ba05d94..7de5638 100644
--- a/data/chips/STM32F778AI.json
+++ b/data/chips/STM32F778AI.json
@@ -430,6 +430,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -592,15 +601,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -831,7 +831,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F779AI.json b/data/chips/STM32F779AI.json
index 549211f..b7fa30e 100644
--- a/data/chips/STM32F779AI.json
+++ b/data/chips/STM32F779AI.json
@@ -436,6 +436,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -598,15 +607,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -837,7 +837,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F779BI.json b/data/chips/STM32F779BI.json
index c46da90..6d2da3c 100644
--- a/data/chips/STM32F779BI.json
+++ b/data/chips/STM32F779BI.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -893,7 +893,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F779II.json b/data/chips/STM32F779II.json
index 3f2f6a2..d527273 100644
--- a/data/chips/STM32F779II.json
+++ b/data/chips/STM32F779II.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -883,7 +883,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32F779NI.json b/data/chips/STM32F779NI.json
index f4bf5f3..f852407 100644
--- a/data/chips/STM32F779NI.json
+++ b/data/chips/STM32F779NI.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1073816320,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v2",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073815808,
@@ -654,15 +663,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073816320,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v2",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
@@ -893,7 +893,13 @@
                             "register": "APB1RSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CRC",
diff --git a/data/chips/STM32G030C6.json b/data/chips/STM32G030C6.json
index ebc1350..0f295b5 100644
--- a/data/chips/STM32G030C6.json
+++ b/data/chips/STM32G030C6.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G030C8.json b/data/chips/STM32G030C8.json
index 30ebb00..1d395bd 100644
--- a/data/chips/STM32G030C8.json
+++ b/data/chips/STM32G030C8.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G030F6.json b/data/chips/STM32G030F6.json
index e067f9f..badc098 100644
--- a/data/chips/STM32G030F6.json
+++ b/data/chips/STM32G030F6.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G030J6.json b/data/chips/STM32G030J6.json
index afeaa21..7216a09 100644
--- a/data/chips/STM32G030J6.json
+++ b/data/chips/STM32G030J6.json
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G030K6.json b/data/chips/STM32G030K6.json
index 310b3f4..550489f 100644
--- a/data/chips/STM32G030K6.json
+++ b/data/chips/STM32G030K6.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G030K8.json b/data/chips/STM32G030K8.json
index 27cbfe4..196d044 100644
--- a/data/chips/STM32G030K8.json
+++ b/data/chips/STM32G030K8.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031C4.json b/data/chips/STM32G031C4.json
index 50c8d7a..77bbc6c 100644
--- a/data/chips/STM32G031C4.json
+++ b/data/chips/STM32G031C4.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031C6.json b/data/chips/STM32G031C6.json
index d8ec603..4c40f82 100644
--- a/data/chips/STM32G031C6.json
+++ b/data/chips/STM32G031C6.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031C8.json b/data/chips/STM32G031C8.json
index 2c2b652..b9fd917 100644
--- a/data/chips/STM32G031C8.json
+++ b/data/chips/STM32G031C8.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031F4.json b/data/chips/STM32G031F4.json
index 63e7217..086af18 100644
--- a/data/chips/STM32G031F4.json
+++ b/data/chips/STM32G031F4.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031F6.json b/data/chips/STM32G031F6.json
index 36902a2..c029b3a 100644
--- a/data/chips/STM32G031F6.json
+++ b/data/chips/STM32G031F6.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031F8.json b/data/chips/STM32G031F8.json
index bd53263..37658e4 100644
--- a/data/chips/STM32G031F8.json
+++ b/data/chips/STM32G031F8.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031G4.json b/data/chips/STM32G031G4.json
index 08e318a..ba26b17 100644
--- a/data/chips/STM32G031G4.json
+++ b/data/chips/STM32G031G4.json
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031G6.json b/data/chips/STM32G031G6.json
index 866376a..d6305ee 100644
--- a/data/chips/STM32G031G6.json
+++ b/data/chips/STM32G031G6.json
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031G8.json b/data/chips/STM32G031G8.json
index 820662c..af44f5c 100644
--- a/data/chips/STM32G031G8.json
+++ b/data/chips/STM32G031G8.json
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031J4.json b/data/chips/STM32G031J4.json
index 5321b5a..e24975f 100644
--- a/data/chips/STM32G031J4.json
+++ b/data/chips/STM32G031J4.json
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031J6.json b/data/chips/STM32G031J6.json
index ae9e396..ba7e054 100644
--- a/data/chips/STM32G031J6.json
+++ b/data/chips/STM32G031J6.json
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031K4.json b/data/chips/STM32G031K4.json
index e21fc4d..8ef7abc 100644
--- a/data/chips/STM32G031K4.json
+++ b/data/chips/STM32G031K4.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031K6.json b/data/chips/STM32G031K6.json
index 8e80f91..c4aa623 100644
--- a/data/chips/STM32G031K6.json
+++ b/data/chips/STM32G031K6.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031K8.json b/data/chips/STM32G031K8.json
index c030332..bf8a83d 100644
--- a/data/chips/STM32G031K8.json
+++ b/data/chips/STM32G031K8.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G031Y8.json b/data/chips/STM32G031Y8.json
index 6d6de9a..5d879de 100644
--- a/data/chips/STM32G031Y8.json
+++ b/data/chips/STM32G031Y8.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041C6.json b/data/chips/STM32G041C6.json
index 43f9327..4b0fa5a 100644
--- a/data/chips/STM32G041C6.json
+++ b/data/chips/STM32G041C6.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041C8.json b/data/chips/STM32G041C8.json
index e968733..b1b1594 100644
--- a/data/chips/STM32G041C8.json
+++ b/data/chips/STM32G041C8.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041F6.json b/data/chips/STM32G041F6.json
index 954e1ae..e4a956b 100644
--- a/data/chips/STM32G041F6.json
+++ b/data/chips/STM32G041F6.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041F8.json b/data/chips/STM32G041F8.json
index eede564..2c64274 100644
--- a/data/chips/STM32G041F8.json
+++ b/data/chips/STM32G041F8.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041G6.json b/data/chips/STM32G041G6.json
index 94e8ba6..dce673e 100644
--- a/data/chips/STM32G041G6.json
+++ b/data/chips/STM32G041G6.json
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041G8.json b/data/chips/STM32G041G8.json
index 83d0a4f..39b9c47 100644
--- a/data/chips/STM32G041G8.json
+++ b/data/chips/STM32G041G8.json
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041J6.json b/data/chips/STM32G041J6.json
index 2c04d8f..f7c97e8 100644
--- a/data/chips/STM32G041J6.json
+++ b/data/chips/STM32G041J6.json
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041K6.json b/data/chips/STM32G041K6.json
index 2d853d3..789c4ba 100644
--- a/data/chips/STM32G041K6.json
+++ b/data/chips/STM32G041K6.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041K8.json b/data/chips/STM32G041K8.json
index 00399fc..c70c45b 100644
--- a/data/chips/STM32G041K8.json
+++ b/data/chips/STM32G041K8.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G041Y8.json b/data/chips/STM32G041Y8.json
index a127a82..d0e5e48 100644
--- a/data/chips/STM32G041Y8.json
+++ b/data/chips/STM32G041Y8.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G050C6.json b/data/chips/STM32G050C6.json
index 7c56837..cc89c70 100644
--- a/data/chips/STM32G050C6.json
+++ b/data/chips/STM32G050C6.json
@@ -499,7 +499,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G050C8.json b/data/chips/STM32G050C8.json
index ab03e67..55d3b05 100644
--- a/data/chips/STM32G050C8.json
+++ b/data/chips/STM32G050C8.json
@@ -499,7 +499,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G050F6.json b/data/chips/STM32G050F6.json
index 04d6d6e..bd78b33 100644
--- a/data/chips/STM32G050F6.json
+++ b/data/chips/STM32G050F6.json
@@ -499,7 +499,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G050K6.json b/data/chips/STM32G050K6.json
index e8c717f..5c73139 100644
--- a/data/chips/STM32G050K6.json
+++ b/data/chips/STM32G050K6.json
@@ -499,7 +499,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G050K8.json b/data/chips/STM32G050K8.json
index 4b5acff..1e20d02 100644
--- a/data/chips/STM32G050K8.json
+++ b/data/chips/STM32G050K8.json
@@ -499,7 +499,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G051C6.json b/data/chips/STM32G051C6.json
index 996cb9a..167b1c1 100644
--- a/data/chips/STM32G051C6.json
+++ b/data/chips/STM32G051C6.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G051C8.json b/data/chips/STM32G051C8.json
index ad12f21..03968b1 100644
--- a/data/chips/STM32G051C8.json
+++ b/data/chips/STM32G051C8.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G051F6.json b/data/chips/STM32G051F6.json
index ffdd892..674008c 100644
--- a/data/chips/STM32G051F6.json
+++ b/data/chips/STM32G051F6.json
@@ -499,7 +499,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G051F8.json b/data/chips/STM32G051F8.json
index 3ff06ef..b4f89bb 100644
--- a/data/chips/STM32G051F8.json
+++ b/data/chips/STM32G051F8.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G051G6.json b/data/chips/STM32G051G6.json
index 593c335..880f626 100644
--- a/data/chips/STM32G051G6.json
+++ b/data/chips/STM32G051G6.json
@@ -495,7 +495,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G051G8.json b/data/chips/STM32G051G8.json
index 3405c13..7b7c204 100644
--- a/data/chips/STM32G051G8.json
+++ b/data/chips/STM32G051G8.json
@@ -495,7 +495,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G051K6.json b/data/chips/STM32G051K6.json
index f68f934..689c8ad 100644
--- a/data/chips/STM32G051K6.json
+++ b/data/chips/STM32G051K6.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G051K8.json b/data/chips/STM32G051K8.json
index fce5b8c..844b0f2 100644
--- a/data/chips/STM32G051K8.json
+++ b/data/chips/STM32G051K8.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G061C6.json b/data/chips/STM32G061C6.json
index e8129ae..1ab5696 100644
--- a/data/chips/STM32G061C6.json
+++ b/data/chips/STM32G061C6.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G061C8.json b/data/chips/STM32G061C8.json
index dba06ea..3c3c086 100644
--- a/data/chips/STM32G061C8.json
+++ b/data/chips/STM32G061C8.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G061F6.json b/data/chips/STM32G061F6.json
index 57c908d..93cb5a9 100644
--- a/data/chips/STM32G061F6.json
+++ b/data/chips/STM32G061F6.json
@@ -499,7 +499,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G061F8.json b/data/chips/STM32G061F8.json
index 20d05a2..db94e1c 100644
--- a/data/chips/STM32G061F8.json
+++ b/data/chips/STM32G061F8.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G061G6.json b/data/chips/STM32G061G6.json
index 56e4fc3..ea1dda6 100644
--- a/data/chips/STM32G061G6.json
+++ b/data/chips/STM32G061G6.json
@@ -495,7 +495,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G061G8.json b/data/chips/STM32G061G8.json
index 04ed313..a068d25 100644
--- a/data/chips/STM32G061G8.json
+++ b/data/chips/STM32G061G8.json
@@ -495,7 +495,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G061K6.json b/data/chips/STM32G061K6.json
index 41229cd..1517895 100644
--- a/data/chips/STM32G061K6.json
+++ b/data/chips/STM32G061K6.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G061K8.json b/data/chips/STM32G061K8.json
index bca4486..d350500 100644
--- a/data/chips/STM32G061K8.json
+++ b/data/chips/STM32G061K8.json
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G070CB.json b/data/chips/STM32G070CB.json
index 359e0fe..3ab8fe9 100644
--- a/data/chips/STM32G070CB.json
+++ b/data/chips/STM32G070CB.json
@@ -305,7 +305,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G070KB.json b/data/chips/STM32G070KB.json
index 62855ba..e7a9cfa 100644
--- a/data/chips/STM32G070KB.json
+++ b/data/chips/STM32G070KB.json
@@ -293,7 +293,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G070RB.json b/data/chips/STM32G070RB.json
index a31ac39..e358402 100644
--- a/data/chips/STM32G070RB.json
+++ b/data/chips/STM32G070RB.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G071C6.json b/data/chips/STM32G071C6.json
index 17612b0..f2f6c8f 100644
--- a/data/chips/STM32G071C6.json
+++ b/data/chips/STM32G071C6.json
@@ -134,7 +134,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -164,7 +164,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071C8.json b/data/chips/STM32G071C8.json
index bd1a38c..b6f3ed1 100644
--- a/data/chips/STM32G071C8.json
+++ b/data/chips/STM32G071C8.json
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -339,7 +339,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071CB.json b/data/chips/STM32G071CB.json
index abde1d8..8b3dabc 100644
--- a/data/chips/STM32G071CB.json
+++ b/data/chips/STM32G071CB.json
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -339,7 +339,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071EB.json b/data/chips/STM32G071EB.json
index 2fc85de..a208560 100644
--- a/data/chips/STM32G071EB.json
+++ b/data/chips/STM32G071EB.json
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -319,7 +319,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071G6.json b/data/chips/STM32G071G6.json
index 3c698e5..e353ebd 100644
--- a/data/chips/STM32G071G6.json
+++ b/data/chips/STM32G071G6.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -144,7 +144,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071G8.json b/data/chips/STM32G071G8.json
index df4a778..28fbb01 100644
--- a/data/chips/STM32G071G8.json
+++ b/data/chips/STM32G071G8.json
@@ -293,7 +293,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -323,7 +323,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071GB.json b/data/chips/STM32G071GB.json
index 4d7c497..89867d0 100644
--- a/data/chips/STM32G071GB.json
+++ b/data/chips/STM32G071GB.json
@@ -293,7 +293,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -323,7 +323,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071K6.json b/data/chips/STM32G071K6.json
index 09dee30..832c5a2 100644
--- a/data/chips/STM32G071K6.json
+++ b/data/chips/STM32G071K6.json
@@ -122,7 +122,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -152,7 +152,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071K8.json b/data/chips/STM32G071K8.json
index c4bfda6..ad53a5b 100644
--- a/data/chips/STM32G071K8.json
+++ b/data/chips/STM32G071K8.json
@@ -305,7 +305,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -335,7 +335,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071KB.json b/data/chips/STM32G071KB.json
index 213cfda..dbd0c72 100644
--- a/data/chips/STM32G071KB.json
+++ b/data/chips/STM32G071KB.json
@@ -305,7 +305,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -335,7 +335,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071R6.json b/data/chips/STM32G071R6.json
index 659710e..565995a 100644
--- a/data/chips/STM32G071R6.json
+++ b/data/chips/STM32G071R6.json
@@ -138,7 +138,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -168,7 +168,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071R8.json b/data/chips/STM32G071R8.json
index 9c7d698..7a1ea75 100644
--- a/data/chips/STM32G071R8.json
+++ b/data/chips/STM32G071R8.json
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -343,7 +343,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G071RB.json b/data/chips/STM32G071RB.json
index b38a83b..fee0a76 100644
--- a/data/chips/STM32G071RB.json
+++ b/data/chips/STM32G071RB.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -347,7 +347,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G081CB.json b/data/chips/STM32G081CB.json
index fc3dc3a..c534100 100644
--- a/data/chips/STM32G081CB.json
+++ b/data/chips/STM32G081CB.json
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -378,7 +378,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G081EB.json b/data/chips/STM32G081EB.json
index e300a41..bc75ceb 100644
--- a/data/chips/STM32G081EB.json
+++ b/data/chips/STM32G081EB.json
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -358,7 +358,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G081GB.json b/data/chips/STM32G081GB.json
index 0793413..c29a612 100644
--- a/data/chips/STM32G081GB.json
+++ b/data/chips/STM32G081GB.json
@@ -293,7 +293,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -362,7 +362,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G081KB.json b/data/chips/STM32G081KB.json
index 6fcebb6..94816e4 100644
--- a/data/chips/STM32G081KB.json
+++ b/data/chips/STM32G081KB.json
@@ -305,7 +305,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -374,7 +374,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G081RB.json b/data/chips/STM32G081RB.json
index c0751bc..e5253b0 100644
--- a/data/chips/STM32G081RB.json
+++ b/data/chips/STM32G081RB.json
@@ -317,7 +317,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -386,7 +386,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B0CE.json b/data/chips/STM32G0B0CE.json
index 18a001c..1ded115 100644
--- a/data/chips/STM32G0B0CE.json
+++ b/data/chips/STM32G0B0CE.json
@@ -496,7 +496,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G0B0KE.json b/data/chips/STM32G0B0KE.json
index 0de6ca0..4a62c0a 100644
--- a/data/chips/STM32G0B0KE.json
+++ b/data/chips/STM32G0B0KE.json
@@ -484,7 +484,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G0B0RE.json b/data/chips/STM32G0B0RE.json
index 36276f7..201a34f 100644
--- a/data/chips/STM32G0B0RE.json
+++ b/data/chips/STM32G0B0RE.json
@@ -504,7 +504,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G0B0VE.json b/data/chips/STM32G0B0VE.json
index 1750fe4..58acfbe 100644
--- a/data/chips/STM32G0B0VE.json
+++ b/data/chips/STM32G0B0VE.json
@@ -504,7 +504,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32G0B1CB.json b/data/chips/STM32G0B1CB.json
index 8d015e8..b951e71 100644
--- a/data/chips/STM32G0B1CB.json
+++ b/data/chips/STM32G0B1CB.json
@@ -497,7 +497,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -527,7 +527,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1CC.json b/data/chips/STM32G0B1CC.json
index 0698037..0939611 100644
--- a/data/chips/STM32G0B1CC.json
+++ b/data/chips/STM32G0B1CC.json
@@ -497,7 +497,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -527,7 +527,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1CE.json b/data/chips/STM32G0B1CE.json
index e736d2e..e2671f1 100644
--- a/data/chips/STM32G0B1CE.json
+++ b/data/chips/STM32G0B1CE.json
@@ -508,7 +508,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -538,7 +538,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1KB.json b/data/chips/STM32G0B1KB.json
index 1c155ba..b96fd4e 100644
--- a/data/chips/STM32G0B1KB.json
+++ b/data/chips/STM32G0B1KB.json
@@ -485,7 +485,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -515,7 +515,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1KC.json b/data/chips/STM32G0B1KC.json
index 15c3763..bb98e71 100644
--- a/data/chips/STM32G0B1KC.json
+++ b/data/chips/STM32G0B1KC.json
@@ -485,7 +485,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -515,7 +515,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1KE.json b/data/chips/STM32G0B1KE.json
index e39b642..752b1af 100644
--- a/data/chips/STM32G0B1KE.json
+++ b/data/chips/STM32G0B1KE.json
@@ -496,7 +496,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -526,7 +526,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1MB.json b/data/chips/STM32G0B1MB.json
index b7891b3..1a81d8f 100644
--- a/data/chips/STM32G0B1MB.json
+++ b/data/chips/STM32G0B1MB.json
@@ -493,7 +493,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -523,7 +523,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1MC.json b/data/chips/STM32G0B1MC.json
index f728841..2a3f6ca 100644
--- a/data/chips/STM32G0B1MC.json
+++ b/data/chips/STM32G0B1MC.json
@@ -493,7 +493,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -523,7 +523,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1ME.json b/data/chips/STM32G0B1ME.json
index 00115c5..293acb2 100644
--- a/data/chips/STM32G0B1ME.json
+++ b/data/chips/STM32G0B1ME.json
@@ -504,7 +504,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -534,7 +534,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1NE.json b/data/chips/STM32G0B1NE.json
index 937cef6..3cb4891 100644
--- a/data/chips/STM32G0B1NE.json
+++ b/data/chips/STM32G0B1NE.json
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -179,7 +179,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1RB.json b/data/chips/STM32G0B1RB.json
index 8fc5d06..ce32749 100644
--- a/data/chips/STM32G0B1RB.json
+++ b/data/chips/STM32G0B1RB.json
@@ -501,7 +501,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -531,7 +531,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1RC.json b/data/chips/STM32G0B1RC.json
index eeddb16..e9f51c8 100644
--- a/data/chips/STM32G0B1RC.json
+++ b/data/chips/STM32G0B1RC.json
@@ -501,7 +501,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -531,7 +531,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1RE.json b/data/chips/STM32G0B1RE.json
index 6587eec..0cba053 100644
--- a/data/chips/STM32G0B1RE.json
+++ b/data/chips/STM32G0B1RE.json
@@ -512,7 +512,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -542,7 +542,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1VB.json b/data/chips/STM32G0B1VB.json
index be3ce11..b6b83e8 100644
--- a/data/chips/STM32G0B1VB.json
+++ b/data/chips/STM32G0B1VB.json
@@ -497,7 +497,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -527,7 +527,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1VC.json b/data/chips/STM32G0B1VC.json
index 9d5aacc..400fcea 100644
--- a/data/chips/STM32G0B1VC.json
+++ b/data/chips/STM32G0B1VC.json
@@ -497,7 +497,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -527,7 +527,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0B1VE.json b/data/chips/STM32G0B1VE.json
index 574a5fc..bb93398 100644
--- a/data/chips/STM32G0B1VE.json
+++ b/data/chips/STM32G0B1VE.json
@@ -508,7 +508,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -538,7 +538,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1CC.json b/data/chips/STM32G0C1CC.json
index a858881..86fcd13 100644
--- a/data/chips/STM32G0C1CC.json
+++ b/data/chips/STM32G0C1CC.json
@@ -497,7 +497,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -566,7 +566,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1CE.json b/data/chips/STM32G0C1CE.json
index ccb2a21..cbf220f 100644
--- a/data/chips/STM32G0C1CE.json
+++ b/data/chips/STM32G0C1CE.json
@@ -508,7 +508,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -577,7 +577,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1KC.json b/data/chips/STM32G0C1KC.json
index 50d642c..91e7564 100644
--- a/data/chips/STM32G0C1KC.json
+++ b/data/chips/STM32G0C1KC.json
@@ -485,7 +485,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -554,7 +554,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1KE.json b/data/chips/STM32G0C1KE.json
index d08624e..934ff66 100644
--- a/data/chips/STM32G0C1KE.json
+++ b/data/chips/STM32G0C1KE.json
@@ -496,7 +496,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -565,7 +565,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1MC.json b/data/chips/STM32G0C1MC.json
index a99738c..79577fe 100644
--- a/data/chips/STM32G0C1MC.json
+++ b/data/chips/STM32G0C1MC.json
@@ -493,7 +493,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -562,7 +562,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1ME.json b/data/chips/STM32G0C1ME.json
index 5cf95d4..72abf90 100644
--- a/data/chips/STM32G0C1ME.json
+++ b/data/chips/STM32G0C1ME.json
@@ -504,7 +504,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -573,7 +573,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1NE.json b/data/chips/STM32G0C1NE.json
index bd58608..cbf99be 100644
--- a/data/chips/STM32G0C1NE.json
+++ b/data/chips/STM32G0C1NE.json
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -218,7 +218,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1RC.json b/data/chips/STM32G0C1RC.json
index fa8ea17..1912659 100644
--- a/data/chips/STM32G0C1RC.json
+++ b/data/chips/STM32G0C1RC.json
@@ -501,7 +501,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -570,7 +570,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1RE.json b/data/chips/STM32G0C1RE.json
index b306ecb..59bcdcf 100644
--- a/data/chips/STM32G0C1RE.json
+++ b/data/chips/STM32G0C1RE.json
@@ -512,7 +512,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -581,7 +581,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1VC.json b/data/chips/STM32G0C1VC.json
index 53c3d41..1e9b996 100644
--- a/data/chips/STM32G0C1VC.json
+++ b/data/chips/STM32G0C1VC.json
@@ -497,7 +497,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -566,7 +566,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G0C1VE.json b/data/chips/STM32G0C1VE.json
index 29a09cb..a2af335 100644
--- a/data/chips/STM32G0C1VE.json
+++ b/data/chips/STM32G0C1VE.json
@@ -508,7 +508,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -577,7 +577,13 @@
                             "register": "APBRSTR1",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32G431C6.json b/data/chips/STM32G431C6.json
index 807ebea..52cf2da 100644
--- a/data/chips/STM32G431C6.json
+++ b/data/chips/STM32G431C6.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -411,15 +420,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431C8.json b/data/chips/STM32G431C8.json
index 821cf04..8ec6b9c 100644
--- a/data/chips/STM32G431C8.json
+++ b/data/chips/STM32G431C8.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -411,15 +420,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431CB.json b/data/chips/STM32G431CB.json
index a463940..1706a49 100644
--- a/data/chips/STM32G431CB.json
+++ b/data/chips/STM32G431CB.json
@@ -332,6 +332,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -415,15 +424,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431K6.json b/data/chips/STM32G431K6.json
index 1d6c006..c89f03d 100644
--- a/data/chips/STM32G431K6.json
+++ b/data/chips/STM32G431K6.json
@@ -312,6 +312,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -379,15 +388,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431K8.json b/data/chips/STM32G431K8.json
index 8bab119..a838a2f 100644
--- a/data/chips/STM32G431K8.json
+++ b/data/chips/STM32G431K8.json
@@ -312,6 +312,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -379,15 +388,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431KB.json b/data/chips/STM32G431KB.json
index b1cd993..0f268dd 100644
--- a/data/chips/STM32G431KB.json
+++ b/data/chips/STM32G431KB.json
@@ -312,6 +312,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -379,15 +388,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431M6.json b/data/chips/STM32G431M6.json
index bf5a1dd..b994094 100644
--- a/data/chips/STM32G431M6.json
+++ b/data/chips/STM32G431M6.json
@@ -340,6 +340,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -443,15 +452,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431M8.json b/data/chips/STM32G431M8.json
index d98332b..db814cb 100644
--- a/data/chips/STM32G431M8.json
+++ b/data/chips/STM32G431M8.json
@@ -340,6 +340,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -443,15 +452,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431MB.json b/data/chips/STM32G431MB.json
index ee7aa20..37c3331 100644
--- a/data/chips/STM32G431MB.json
+++ b/data/chips/STM32G431MB.json
@@ -340,6 +340,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -443,15 +452,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431R6.json b/data/chips/STM32G431R6.json
index c863961..7521f23 100644
--- a/data/chips/STM32G431R6.json
+++ b/data/chips/STM32G431R6.json
@@ -344,6 +344,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -447,15 +456,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431R8.json b/data/chips/STM32G431R8.json
index 33a439c..7f9599b 100644
--- a/data/chips/STM32G431R8.json
+++ b/data/chips/STM32G431R8.json
@@ -344,6 +344,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -447,15 +456,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431RB.json b/data/chips/STM32G431RB.json
index 32b38e6..480af11 100644
--- a/data/chips/STM32G431RB.json
+++ b/data/chips/STM32G431RB.json
@@ -344,6 +344,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -447,15 +456,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431V6.json b/data/chips/STM32G431V6.json
index 55a53b0..65b6ded 100644
--- a/data/chips/STM32G431V6.json
+++ b/data/chips/STM32G431V6.json
@@ -340,6 +340,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -443,15 +452,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431V8.json b/data/chips/STM32G431V8.json
index ec6f884..d9bd419 100644
--- a/data/chips/STM32G431V8.json
+++ b/data/chips/STM32G431V8.json
@@ -340,6 +340,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -443,15 +452,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G431VB.json b/data/chips/STM32G431VB.json
index 4f016fc..172885f 100644
--- a/data/chips/STM32G431VB.json
+++ b/data/chips/STM32G431VB.json
@@ -340,6 +340,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -443,15 +452,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G441CB.json b/data/chips/STM32G441CB.json
index 2680790..d15e3bf 100644
--- a/data/chips/STM32G441CB.json
+++ b/data/chips/STM32G441CB.json
@@ -326,6 +326,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -409,15 +418,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G441KB.json b/data/chips/STM32G441KB.json
index f818789..319ccb9 100644
--- a/data/chips/STM32G441KB.json
+++ b/data/chips/STM32G441KB.json
@@ -306,6 +306,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -373,15 +382,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G441MB.json b/data/chips/STM32G441MB.json
index 4a9f7f9..ca30640 100644
--- a/data/chips/STM32G441MB.json
+++ b/data/chips/STM32G441MB.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -437,15 +446,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G441RB.json b/data/chips/STM32G441RB.json
index 6ad822e..ebe0c56 100644
--- a/data/chips/STM32G441RB.json
+++ b/data/chips/STM32G441RB.json
@@ -338,6 +338,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -441,15 +450,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G441VB.json b/data/chips/STM32G441VB.json
index 477d4a5..fe67a34 100644
--- a/data/chips/STM32G441VB.json
+++ b/data/chips/STM32G441VB.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -437,15 +446,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G471CC.json b/data/chips/STM32G471CC.json
index 0559fcf..0a591bd 100644
--- a/data/chips/STM32G471CC.json
+++ b/data/chips/STM32G471CC.json
@@ -123,6 +123,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -258,8 +267,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471CE.json b/data/chips/STM32G471CE.json
index a3b3c79..cb1217c 100644
--- a/data/chips/STM32G471CE.json
+++ b/data/chips/STM32G471CE.json
@@ -123,6 +123,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -258,8 +267,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471MC.json b/data/chips/STM32G471MC.json
index 846ec2d..a2e74a2 100644
--- a/data/chips/STM32G471MC.json
+++ b/data/chips/STM32G471MC.json
@@ -135,6 +135,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -326,8 +335,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471ME.json b/data/chips/STM32G471ME.json
index d2314da..e8e4e36 100644
--- a/data/chips/STM32G471ME.json
+++ b/data/chips/STM32G471ME.json
@@ -139,6 +139,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -330,8 +339,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471QC.json b/data/chips/STM32G471QC.json
index d37c1fe..4c7c5de 100644
--- a/data/chips/STM32G471QC.json
+++ b/data/chips/STM32G471QC.json
@@ -135,6 +135,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -338,8 +347,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471QE.json b/data/chips/STM32G471QE.json
index f017f68..37371f0 100644
--- a/data/chips/STM32G471QE.json
+++ b/data/chips/STM32G471QE.json
@@ -135,6 +135,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -338,8 +347,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471RC.json b/data/chips/STM32G471RC.json
index 911bd9b..9921da8 100644
--- a/data/chips/STM32G471RC.json
+++ b/data/chips/STM32G471RC.json
@@ -135,6 +135,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -290,8 +299,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471RE.json b/data/chips/STM32G471RE.json
index 84c32dc..3229a2c 100644
--- a/data/chips/STM32G471RE.json
+++ b/data/chips/STM32G471RE.json
@@ -135,6 +135,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -290,8 +299,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471VC.json b/data/chips/STM32G471VC.json
index b3121dc..b35ec22 100644
--- a/data/chips/STM32G471VC.json
+++ b/data/chips/STM32G471VC.json
@@ -143,6 +143,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -346,8 +355,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G471VE.json b/data/chips/STM32G471VE.json
index a91d37d..9d91786 100644
--- a/data/chips/STM32G471VE.json
+++ b/data/chips/STM32G471VE.json
@@ -143,6 +143,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -346,8 +355,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G473CB.json b/data/chips/STM32G473CB.json
index 571e378..6a7b0e9 100644
--- a/data/chips/STM32G473CB.json
+++ b/data/chips/STM32G473CB.json
@@ -322,6 +322,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -456,6 +465,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -554,15 +572,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473CC.json b/data/chips/STM32G473CC.json
index b853888..9f3c7f5 100644
--- a/data/chips/STM32G473CC.json
+++ b/data/chips/STM32G473CC.json
@@ -322,6 +322,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -456,6 +465,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -554,15 +572,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473CE.json b/data/chips/STM32G473CE.json
index ac79a07..a090fbe 100644
--- a/data/chips/STM32G473CE.json
+++ b/data/chips/STM32G473CE.json
@@ -322,6 +322,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -456,6 +465,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -554,15 +572,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473MB.json b/data/chips/STM32G473MB.json
index 6727aea..cba978d 100644
--- a/data/chips/STM32G473MB.json
+++ b/data/chips/STM32G473MB.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -524,6 +533,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -694,15 +712,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473MC.json b/data/chips/STM32G473MC.json
index d0989f9..ba423b1 100644
--- a/data/chips/STM32G473MC.json
+++ b/data/chips/STM32G473MC.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -524,6 +533,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -694,15 +712,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473ME.json b/data/chips/STM32G473ME.json
index c9e54c6..343a21a 100644
--- a/data/chips/STM32G473ME.json
+++ b/data/chips/STM32G473ME.json
@@ -338,6 +338,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -528,6 +537,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -698,15 +716,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473PB.json b/data/chips/STM32G473PB.json
index 7deeb2e..4a3bec3 100644
--- a/data/chips/STM32G473PB.json
+++ b/data/chips/STM32G473PB.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -530,6 +539,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -724,15 +742,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473PC.json b/data/chips/STM32G473PC.json
index 6c3deb0..240db83 100644
--- a/data/chips/STM32G473PC.json
+++ b/data/chips/STM32G473PC.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -530,6 +539,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -724,15 +742,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473PE.json b/data/chips/STM32G473PE.json
index 4d5c0fe..d465cb6 100644
--- a/data/chips/STM32G473PE.json
+++ b/data/chips/STM32G473PE.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -530,6 +539,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -724,15 +742,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473QB.json b/data/chips/STM32G473QB.json
index 2ac4506..1a38483 100644
--- a/data/chips/STM32G473QB.json
+++ b/data/chips/STM32G473QB.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -536,6 +545,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -730,15 +748,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473QC.json b/data/chips/STM32G473QC.json
index 70cff40..8cd3757 100644
--- a/data/chips/STM32G473QC.json
+++ b/data/chips/STM32G473QC.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -536,6 +545,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -730,15 +748,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473QE.json b/data/chips/STM32G473QE.json
index 5738d72..4e1c04d 100644
--- a/data/chips/STM32G473QE.json
+++ b/data/chips/STM32G473QE.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -536,6 +545,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -730,15 +748,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473RB.json b/data/chips/STM32G473RB.json
index f1e03a8..6e8ca0d 100644
--- a/data/chips/STM32G473RB.json
+++ b/data/chips/STM32G473RB.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -488,6 +497,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -586,15 +604,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473RC.json b/data/chips/STM32G473RC.json
index 9f54611..1571849 100644
--- a/data/chips/STM32G473RC.json
+++ b/data/chips/STM32G473RC.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -488,6 +497,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -586,15 +604,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473RE.json b/data/chips/STM32G473RE.json
index 20dd66b..e50506b 100644
--- a/data/chips/STM32G473RE.json
+++ b/data/chips/STM32G473RE.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -488,6 +497,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -586,15 +604,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473VB.json b/data/chips/STM32G473VB.json
index a10f33f..6ffcb20 100644
--- a/data/chips/STM32G473VB.json
+++ b/data/chips/STM32G473VB.json
@@ -338,6 +338,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -540,6 +549,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -734,15 +752,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473VC.json b/data/chips/STM32G473VC.json
index 260e2b8..1103043 100644
--- a/data/chips/STM32G473VC.json
+++ b/data/chips/STM32G473VC.json
@@ -338,6 +338,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -540,6 +549,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -734,15 +752,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G473VE.json b/data/chips/STM32G473VE.json
index bf769b7..be35689 100644
--- a/data/chips/STM32G473VE.json
+++ b/data/chips/STM32G473VE.json
@@ -338,6 +338,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -540,6 +549,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -734,15 +752,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474CB.json b/data/chips/STM32G474CB.json
index 9af09df..53007b8 100644
--- a/data/chips/STM32G474CB.json
+++ b/data/chips/STM32G474CB.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -468,6 +477,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -566,15 +584,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474CC.json b/data/chips/STM32G474CC.json
index e4d5ba9..f769e19 100644
--- a/data/chips/STM32G474CC.json
+++ b/data/chips/STM32G474CC.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -468,6 +477,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -566,15 +584,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474CE.json b/data/chips/STM32G474CE.json
index 6acea5e..99fc7cf 100644
--- a/data/chips/STM32G474CE.json
+++ b/data/chips/STM32G474CE.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -468,6 +477,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -566,15 +584,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474MB.json b/data/chips/STM32G474MB.json
index 673e41d..ed361c5 100644
--- a/data/chips/STM32G474MB.json
+++ b/data/chips/STM32G474MB.json
@@ -346,6 +346,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -536,6 +545,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -706,15 +724,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474MC.json b/data/chips/STM32G474MC.json
index f4e8408..6a3c598 100644
--- a/data/chips/STM32G474MC.json
+++ b/data/chips/STM32G474MC.json
@@ -346,6 +346,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -536,6 +545,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -706,15 +724,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474ME.json b/data/chips/STM32G474ME.json
index 19b43a1..a0717d3 100644
--- a/data/chips/STM32G474ME.json
+++ b/data/chips/STM32G474ME.json
@@ -350,6 +350,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -540,6 +549,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -710,15 +728,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474PB.json b/data/chips/STM32G474PB.json
index 6d78843..7f41561 100644
--- a/data/chips/STM32G474PB.json
+++ b/data/chips/STM32G474PB.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -530,6 +539,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -724,15 +742,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474PC.json b/data/chips/STM32G474PC.json
index a10df50..e92abc4 100644
--- a/data/chips/STM32G474PC.json
+++ b/data/chips/STM32G474PC.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -530,6 +539,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -724,15 +742,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474PE.json b/data/chips/STM32G474PE.json
index dec6ab9..29a82e0 100644
--- a/data/chips/STM32G474PE.json
+++ b/data/chips/STM32G474PE.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -530,6 +539,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -724,15 +742,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474QB.json b/data/chips/STM32G474QB.json
index 7f7c977..63d91b3 100644
--- a/data/chips/STM32G474QB.json
+++ b/data/chips/STM32G474QB.json
@@ -346,6 +346,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -548,6 +557,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -742,15 +760,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474QC.json b/data/chips/STM32G474QC.json
index 439fe4b..d07d7e0 100644
--- a/data/chips/STM32G474QC.json
+++ b/data/chips/STM32G474QC.json
@@ -346,6 +346,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -548,6 +557,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -742,15 +760,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474QE.json b/data/chips/STM32G474QE.json
index 9ae2ba3..2b08c47 100644
--- a/data/chips/STM32G474QE.json
+++ b/data/chips/STM32G474QE.json
@@ -346,6 +346,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -548,6 +557,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -742,15 +760,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474RB.json b/data/chips/STM32G474RB.json
index 281d67f..6909f2a 100644
--- a/data/chips/STM32G474RB.json
+++ b/data/chips/STM32G474RB.json
@@ -346,6 +346,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -500,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -598,15 +616,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474RC.json b/data/chips/STM32G474RC.json
index 9d2e358..67d286a 100644
--- a/data/chips/STM32G474RC.json
+++ b/data/chips/STM32G474RC.json
@@ -346,6 +346,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -500,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -598,15 +616,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474RE.json b/data/chips/STM32G474RE.json
index 85cd309..25cf3fa 100644
--- a/data/chips/STM32G474RE.json
+++ b/data/chips/STM32G474RE.json
@@ -346,6 +346,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -500,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -598,15 +616,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474VB.json b/data/chips/STM32G474VB.json
index 595fe54..588f898 100644
--- a/data/chips/STM32G474VB.json
+++ b/data/chips/STM32G474VB.json
@@ -350,6 +350,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -552,6 +561,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -746,15 +764,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474VC.json b/data/chips/STM32G474VC.json
index fcae400..24aaa19 100644
--- a/data/chips/STM32G474VC.json
+++ b/data/chips/STM32G474VC.json
@@ -350,6 +350,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -552,6 +561,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -746,15 +764,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G474VE.json b/data/chips/STM32G474VE.json
index 50d760b..d3bb760 100644
--- a/data/chips/STM32G474VE.json
+++ b/data/chips/STM32G474VE.json
@@ -350,6 +350,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -552,6 +561,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -746,15 +764,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32G483CE.json b/data/chips/STM32G483CE.json
index 4ef35ec..8cb6d71 100644
--- a/data/chips/STM32G483CE.json
+++ b/data/chips/STM32G483CE.json
@@ -322,6 +322,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -456,6 +465,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -554,15 +572,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G483ME.json b/data/chips/STM32G483ME.json
index 1339c08..45c9a26 100644
--- a/data/chips/STM32G483ME.json
+++ b/data/chips/STM32G483ME.json
@@ -338,6 +338,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -528,6 +537,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -698,15 +716,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G483PE.json b/data/chips/STM32G483PE.json
index 4249106..ddbeb81 100644
--- a/data/chips/STM32G483PE.json
+++ b/data/chips/STM32G483PE.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -530,6 +539,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -724,15 +742,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G483QE.json b/data/chips/STM32G483QE.json
index 3afadb0..5fb02b9 100644
--- a/data/chips/STM32G483QE.json
+++ b/data/chips/STM32G483QE.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -536,6 +545,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -730,15 +748,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G483RE.json b/data/chips/STM32G483RE.json
index 899e816..dba1da4 100644
--- a/data/chips/STM32G483RE.json
+++ b/data/chips/STM32G483RE.json
@@ -334,6 +334,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -488,6 +497,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -586,15 +604,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G483VE.json b/data/chips/STM32G483VE.json
index 094b86c..6a42c52 100644
--- a/data/chips/STM32G483VE.json
+++ b/data/chips/STM32G483VE.json
@@ -338,6 +338,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -540,6 +549,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -734,15 +752,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G484CE.json b/data/chips/STM32G484CE.json
index d732013..388ddc0 100644
--- a/data/chips/STM32G484CE.json
+++ b/data/chips/STM32G484CE.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -462,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -560,15 +578,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G484ME.json b/data/chips/STM32G484ME.json
index 81d4e09..cb26a43 100644
--- a/data/chips/STM32G484ME.json
+++ b/data/chips/STM32G484ME.json
@@ -344,6 +344,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -534,6 +543,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -704,15 +722,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G484PE.json b/data/chips/STM32G484PE.json
index 4103a0f..02e175f 100644
--- a/data/chips/STM32G484PE.json
+++ b/data/chips/STM32G484PE.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -530,6 +539,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -724,15 +742,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G484QE.json b/data/chips/STM32G484QE.json
index d393ab2..5b98657 100644
--- a/data/chips/STM32G484QE.json
+++ b/data/chips/STM32G484QE.json
@@ -340,6 +340,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -542,6 +551,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -736,15 +754,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G484RE.json b/data/chips/STM32G484RE.json
index f60a117..8144783 100644
--- a/data/chips/STM32G484RE.json
+++ b/data/chips/STM32G484RE.json
@@ -340,6 +340,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -494,6 +503,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -592,15 +610,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G484VE.json b/data/chips/STM32G484VE.json
index 0c5467f..d094873 100644
--- a/data/chips/STM32G484VE.json
+++ b/data/chips/STM32G484VE.json
@@ -344,6 +344,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -546,6 +555,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC4",
                     "address": 1342178560,
@@ -740,15 +758,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32G491CC.json b/data/chips/STM32G491CC.json
index 9bfc18a..7c1c515 100644
--- a/data/chips/STM32G491CC.json
+++ b/data/chips/STM32G491CC.json
@@ -316,6 +316,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -451,8 +460,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491CE.json b/data/chips/STM32G491CE.json
index b7c54fe..b68bbce 100644
--- a/data/chips/STM32G491CE.json
+++ b/data/chips/STM32G491CE.json
@@ -316,6 +316,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -451,8 +460,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491KC.json b/data/chips/STM32G491KC.json
index 2480c38..c0e7701 100644
--- a/data/chips/STM32G491KC.json
+++ b/data/chips/STM32G491KC.json
@@ -296,6 +296,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -407,8 +416,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491KE.json b/data/chips/STM32G491KE.json
index 79839d1..f44d8cb 100644
--- a/data/chips/STM32G491KE.json
+++ b/data/chips/STM32G491KE.json
@@ -296,6 +296,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -407,8 +416,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491MC.json b/data/chips/STM32G491MC.json
index 48325b1..382b764 100644
--- a/data/chips/STM32G491MC.json
+++ b/data/chips/STM32G491MC.json
@@ -332,6 +332,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -519,8 +528,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491ME.json b/data/chips/STM32G491ME.json
index cd34294..608f423 100644
--- a/data/chips/STM32G491ME.json
+++ b/data/chips/STM32G491ME.json
@@ -332,6 +332,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -519,8 +528,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491RC.json b/data/chips/STM32G491RC.json
index 2c217cf..d53ac55 100644
--- a/data/chips/STM32G491RC.json
+++ b/data/chips/STM32G491RC.json
@@ -332,6 +332,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -487,8 +496,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491RE.json b/data/chips/STM32G491RE.json
index 4b5751e..dbe3b7a 100644
--- a/data/chips/STM32G491RE.json
+++ b/data/chips/STM32G491RE.json
@@ -336,6 +336,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -491,8 +500,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491VC.json b/data/chips/STM32G491VC.json
index beecbae..03909fd 100644
--- a/data/chips/STM32G491VC.json
+++ b/data/chips/STM32G491VC.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -531,8 +540,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G491VE.json b/data/chips/STM32G491VE.json
index a597990..0a8af39 100644
--- a/data/chips/STM32G491VE.json
+++ b/data/chips/STM32G491VE.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -531,8 +540,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G4A1CE.json b/data/chips/STM32G4A1CE.json
index 8554f46..597ed82 100644
--- a/data/chips/STM32G4A1CE.json
+++ b/data/chips/STM32G4A1CE.json
@@ -316,6 +316,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -451,8 +460,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G4A1KE.json b/data/chips/STM32G4A1KE.json
index 2618b7f..70e3f0b 100644
--- a/data/chips/STM32G4A1KE.json
+++ b/data/chips/STM32G4A1KE.json
@@ -296,6 +296,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -407,8 +416,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G4A1ME.json b/data/chips/STM32G4A1ME.json
index 6e1b7e2..c8252b8 100644
--- a/data/chips/STM32G4A1ME.json
+++ b/data/chips/STM32G4A1ME.json
@@ -332,6 +332,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -519,8 +528,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G4A1RE.json b/data/chips/STM32G4A1RE.json
index e588acb..3c69caa 100644
--- a/data/chips/STM32G4A1RE.json
+++ b/data/chips/STM32G4A1RE.json
@@ -336,6 +336,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -491,8 +500,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32G4A1VE.json b/data/chips/STM32G4A1VE.json
index 5dee6e5..03300e3 100644
--- a/data/chips/STM32G4A1VE.json
+++ b/data/chips/STM32G4A1VE.json
@@ -328,6 +328,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342178048,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342177536,
@@ -531,8 +540,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1342178048,
+                    "name": "ADC345_COMMON",
+                    "address": 1342179072,
                     "registers": {
                         "kind": "adccommon",
                         "version": "v4",
diff --git a/data/chips/STM32H503CB.json b/data/chips/STM32H503CB.json
index 8e98d4e..25cca6c 100644
--- a/data/chips/STM32H503CB.json
+++ b/data/chips/STM32H503CB.json
@@ -156,7 +156,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC12_COMMON",
                     "address": 1107460864,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32H503EB.json b/data/chips/STM32H503EB.json
index 165f5d4..79d99e2 100644
--- a/data/chips/STM32H503EB.json
+++ b/data/chips/STM32H503EB.json
@@ -120,7 +120,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC12_COMMON",
                     "address": 1107460864,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32H503KB.json b/data/chips/STM32H503KB.json
index 25fa49c..a2d32d9 100644
--- a/data/chips/STM32H503KB.json
+++ b/data/chips/STM32H503KB.json
@@ -152,7 +152,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC12_COMMON",
                     "address": 1107460864,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32H503RB.json b/data/chips/STM32H503RB.json
index 3c1a924..7a764b6 100644
--- a/data/chips/STM32H503RB.json
+++ b/data/chips/STM32H503RB.json
@@ -192,7 +192,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC12_COMMON",
                     "address": 1107460864,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32H562AG.json b/data/chips/STM32H562AG.json
index 098d742..7a85b4a 100644
--- a/data/chips/STM32H562AG.json
+++ b/data/chips/STM32H562AG.json
@@ -192,6 +192,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -344,15 +353,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -375,7 +375,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562AI.json b/data/chips/STM32H562AI.json
index 825364a..a3b23aa 100644
--- a/data/chips/STM32H562AI.json
+++ b/data/chips/STM32H562AI.json
@@ -203,6 +203,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -355,15 +364,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -386,7 +386,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562IG.json b/data/chips/STM32H562IG.json
index adfa74a..f9475de 100644
--- a/data/chips/STM32H562IG.json
+++ b/data/chips/STM32H562IG.json
@@ -196,6 +196,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -348,15 +357,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -379,7 +379,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562II.json b/data/chips/STM32H562II.json
index 481dc6e..093bda3 100644
--- a/data/chips/STM32H562II.json
+++ b/data/chips/STM32H562II.json
@@ -207,6 +207,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,15 +368,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -390,7 +390,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562RG.json b/data/chips/STM32H562RG.json
index 0ae556a..a81a855 100644
--- a/data/chips/STM32H562RG.json
+++ b/data/chips/STM32H562RG.json
@@ -184,6 +184,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -324,15 +333,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -355,7 +355,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562RI.json b/data/chips/STM32H562RI.json
index f557ad7..d889631 100644
--- a/data/chips/STM32H562RI.json
+++ b/data/chips/STM32H562RI.json
@@ -195,6 +195,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -335,15 +344,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -366,7 +366,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562VG.json b/data/chips/STM32H562VG.json
index 504eab4..1c224a0 100644
--- a/data/chips/STM32H562VG.json
+++ b/data/chips/STM32H562VG.json
@@ -180,6 +180,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -320,15 +329,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -351,7 +351,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562VI.json b/data/chips/STM32H562VI.json
index cc843bc..37377a5 100644
--- a/data/chips/STM32H562VI.json
+++ b/data/chips/STM32H562VI.json
@@ -191,6 +191,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -331,15 +340,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -362,7 +362,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562ZG.json b/data/chips/STM32H562ZG.json
index ed1c524..ae29ca3 100644
--- a/data/chips/STM32H562ZG.json
+++ b/data/chips/STM32H562ZG.json
@@ -192,6 +192,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -344,15 +353,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -375,7 +375,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H562ZI.json b/data/chips/STM32H562ZI.json
index 65c3ff1..aa46e2e 100644
--- a/data/chips/STM32H562ZI.json
+++ b/data/chips/STM32H562ZI.json
@@ -203,6 +203,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -355,15 +364,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -386,7 +386,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563AG.json b/data/chips/STM32H563AG.json
index 457b43e..31e9f4b 100644
--- a/data/chips/STM32H563AG.json
+++ b/data/chips/STM32H563AG.json
@@ -192,6 +192,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -344,15 +353,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -375,7 +375,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563AI.json b/data/chips/STM32H563AI.json
index 0f26264..4e9ad61 100644
--- a/data/chips/STM32H563AI.json
+++ b/data/chips/STM32H563AI.json
@@ -207,6 +207,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,15 +368,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -390,7 +390,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563IG.json b/data/chips/STM32H563IG.json
index 2a2dead..31ee8b1 100644
--- a/data/chips/STM32H563IG.json
+++ b/data/chips/STM32H563IG.json
@@ -196,6 +196,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -348,15 +357,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -379,7 +379,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563II.json b/data/chips/STM32H563II.json
index fba16b6..d075cb9 100644
--- a/data/chips/STM32H563II.json
+++ b/data/chips/STM32H563II.json
@@ -215,6 +215,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -367,15 +376,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -398,7 +398,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563MI.json b/data/chips/STM32H563MI.json
index 653b2f8..ba76cf1 100644
--- a/data/chips/STM32H563MI.json
+++ b/data/chips/STM32H563MI.json
@@ -191,6 +191,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -331,15 +340,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -362,7 +362,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563RG.json b/data/chips/STM32H563RG.json
index fdbea20..deed332 100644
--- a/data/chips/STM32H563RG.json
+++ b/data/chips/STM32H563RG.json
@@ -184,6 +184,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -324,15 +333,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -355,7 +355,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563RI.json b/data/chips/STM32H563RI.json
index e6060bb..2afe0eb 100644
--- a/data/chips/STM32H563RI.json
+++ b/data/chips/STM32H563RI.json
@@ -195,6 +195,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -335,15 +344,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -366,7 +366,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563VG.json b/data/chips/STM32H563VG.json
index d5fa752..c8bc192 100644
--- a/data/chips/STM32H563VG.json
+++ b/data/chips/STM32H563VG.json
@@ -180,6 +180,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -320,15 +329,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -351,7 +351,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563VI.json b/data/chips/STM32H563VI.json
index 311dfdc..c568d6c 100644
--- a/data/chips/STM32H563VI.json
+++ b/data/chips/STM32H563VI.json
@@ -195,6 +195,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -335,15 +344,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -366,7 +366,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563ZG.json b/data/chips/STM32H563ZG.json
index 8132c69..7dcb956 100644
--- a/data/chips/STM32H563ZG.json
+++ b/data/chips/STM32H563ZG.json
@@ -192,6 +192,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -344,15 +353,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -375,7 +375,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H563ZI.json b/data/chips/STM32H563ZI.json
index feb0203..67c9c45 100644
--- a/data/chips/STM32H563ZI.json
+++ b/data/chips/STM32H563ZI.json
@@ -207,6 +207,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,15 +368,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CEC",
                     "address": 1073770496,
@@ -390,7 +390,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H573AI.json b/data/chips/STM32H573AI.json
index f7a7c4a..813bcd7 100644
--- a/data/chips/STM32H573AI.json
+++ b/data/chips/STM32H573AI.json
@@ -207,6 +207,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,15 +368,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
@@ -439,7 +439,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H573II.json b/data/chips/STM32H573II.json
index 942902e..f0b53ad 100644
--- a/data/chips/STM32H573II.json
+++ b/data/chips/STM32H573II.json
@@ -215,6 +215,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -367,15 +376,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
@@ -447,7 +447,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H573MI.json b/data/chips/STM32H573MI.json
index 21d81ed..d4c5b14 100644
--- a/data/chips/STM32H573MI.json
+++ b/data/chips/STM32H573MI.json
@@ -191,6 +191,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -331,15 +340,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
@@ -411,7 +411,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H573RI.json b/data/chips/STM32H573RI.json
index b3ffb95..edd7aa9 100644
--- a/data/chips/STM32H573RI.json
+++ b/data/chips/STM32H573RI.json
@@ -195,6 +195,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -335,15 +344,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
@@ -415,7 +415,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H573VI.json b/data/chips/STM32H573VI.json
index d94dc67..a714ad8 100644
--- a/data/chips/STM32H573VI.json
+++ b/data/chips/STM32H573VI.json
@@ -195,6 +195,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -335,15 +344,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
@@ -415,7 +415,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H573ZI.json b/data/chips/STM32H573ZI.json
index 9483f7d..9f7befa 100644
--- a/data/chips/STM32H573ZI.json
+++ b/data/chips/STM32H573ZI.json
@@ -207,6 +207,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "h5",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,15 +368,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "h5",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
@@ -439,7 +439,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "CORDIC",
diff --git a/data/chips/STM32H723VE.json b/data/chips/STM32H723VE.json
index cc35a5a..d8e7a8b 100644
--- a/data/chips/STM32H723VE.json
+++ b/data/chips/STM32H723VE.json
@@ -410,6 +410,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -594,15 +603,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -680,7 +680,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H723VG.json b/data/chips/STM32H723VG.json
index cfeb062..3943427 100644
--- a/data/chips/STM32H723VG.json
+++ b/data/chips/STM32H723VG.json
@@ -410,6 +410,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -594,15 +603,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -680,7 +680,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H723ZE.json b/data/chips/STM32H723ZE.json
index 244a752..845ccb3 100644
--- a/data/chips/STM32H723ZE.json
+++ b/data/chips/STM32H723ZE.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -706,15 +715,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -792,7 +792,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H723ZG.json b/data/chips/STM32H723ZG.json
index bd4fdb6..7d2e731 100644
--- a/data/chips/STM32H723ZG.json
+++ b/data/chips/STM32H723ZG.json
@@ -438,6 +438,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -706,15 +715,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -792,7 +792,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725AE.json b/data/chips/STM32H725AE.json
index 15eb2c9..c3016ec 100644
--- a/data/chips/STM32H725AE.json
+++ b/data/chips/STM32H725AE.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -732,15 +741,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -818,7 +818,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725AG.json b/data/chips/STM32H725AG.json
index 78d3601..c4774e4 100644
--- a/data/chips/STM32H725AG.json
+++ b/data/chips/STM32H725AG.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -738,15 +747,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -824,7 +824,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725IE.json b/data/chips/STM32H725IE.json
index d919f2e..6e4cf8c 100644
--- a/data/chips/STM32H725IE.json
+++ b/data/chips/STM32H725IE.json
@@ -444,6 +444,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -748,15 +757,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -834,7 +834,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725IG.json b/data/chips/STM32H725IG.json
index bda53f0..584cd10 100644
--- a/data/chips/STM32H725IG.json
+++ b/data/chips/STM32H725IG.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -754,15 +763,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -840,7 +840,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725RE.json b/data/chips/STM32H725RE.json
index f3916d4..3968224 100644
--- a/data/chips/STM32H725RE.json
+++ b/data/chips/STM32H725RE.json
@@ -400,6 +400,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -572,15 +581,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -658,7 +658,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725RG.json b/data/chips/STM32H725RG.json
index 955cda7..ff5ca80 100644
--- a/data/chips/STM32H725RG.json
+++ b/data/chips/STM32H725RG.json
@@ -406,6 +406,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -578,15 +587,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -664,7 +664,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725VE.json b/data/chips/STM32H725VE.json
index cba3e2f..aef678e 100644
--- a/data/chips/STM32H725VE.json
+++ b/data/chips/STM32H725VE.json
@@ -404,6 +404,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -588,15 +597,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -674,7 +674,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725VG.json b/data/chips/STM32H725VG.json
index 17ef3b7..4323748 100644
--- a/data/chips/STM32H725VG.json
+++ b/data/chips/STM32H725VG.json
@@ -414,6 +414,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -598,15 +607,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -684,7 +684,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725ZE.json b/data/chips/STM32H725ZE.json
index 766fb3b..51f60f5 100644
--- a/data/chips/STM32H725ZE.json
+++ b/data/chips/STM32H725ZE.json
@@ -404,6 +404,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -628,15 +637,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -714,7 +714,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H725ZG.json b/data/chips/STM32H725ZG.json
index 5708294..b497415 100644
--- a/data/chips/STM32H725ZG.json
+++ b/data/chips/STM32H725ZG.json
@@ -410,6 +410,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -634,15 +643,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -720,7 +720,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H730AB.json b/data/chips/STM32H730AB.json
index 86198dd..9cca22e 100644
--- a/data/chips/STM32H730AB.json
+++ b/data/chips/STM32H730AB.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -750,15 +759,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -836,7 +836,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H730IB.json b/data/chips/STM32H730IB.json
index 56e8f5c..0b8bd2b 100644
--- a/data/chips/STM32H730IB.json
+++ b/data/chips/STM32H730IB.json
@@ -462,6 +462,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -766,15 +775,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -852,7 +852,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H730VB.json b/data/chips/STM32H730VB.json
index c4f5693..d01974f 100644
--- a/data/chips/STM32H730VB.json
+++ b/data/chips/STM32H730VB.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -606,15 +615,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -692,7 +692,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H730ZB.json b/data/chips/STM32H730ZB.json
index 6c7f363..095ae7b 100644
--- a/data/chips/STM32H730ZB.json
+++ b/data/chips/STM32H730ZB.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -718,15 +727,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -804,7 +804,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H733VG.json b/data/chips/STM32H733VG.json
index 436fa63..7e847ad 100644
--- a/data/chips/STM32H733VG.json
+++ b/data/chips/STM32H733VG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -606,15 +615,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -692,7 +692,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H733ZG.json b/data/chips/STM32H733ZG.json
index 44ff0b9..4cc4dd7 100644
--- a/data/chips/STM32H733ZG.json
+++ b/data/chips/STM32H733ZG.json
@@ -450,6 +450,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -718,15 +727,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -804,7 +804,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H735AG.json b/data/chips/STM32H735AG.json
index b1c0a75..261fea4 100644
--- a/data/chips/STM32H735AG.json
+++ b/data/chips/STM32H735AG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -750,15 +759,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -836,7 +836,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H735IG.json b/data/chips/STM32H735IG.json
index 24a10bc..b2e87dd 100644
--- a/data/chips/STM32H735IG.json
+++ b/data/chips/STM32H735IG.json
@@ -462,6 +462,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -766,15 +775,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -852,7 +852,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H735RG.json b/data/chips/STM32H735RG.json
index 2149d3b..b879a5f 100644
--- a/data/chips/STM32H735RG.json
+++ b/data/chips/STM32H735RG.json
@@ -418,6 +418,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -590,15 +599,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -676,7 +676,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H735VG.json b/data/chips/STM32H735VG.json
index 4072d30..c1312af 100644
--- a/data/chips/STM32H735VG.json
+++ b/data/chips/STM32H735VG.json
@@ -426,6 +426,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -610,15 +619,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -696,7 +696,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H735ZG.json b/data/chips/STM32H735ZG.json
index 953787a..1848a83 100644
--- a/data/chips/STM32H735ZG.json
+++ b/data/chips/STM32H735ZG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -646,15 +655,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -732,7 +732,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H742AG.json b/data/chips/STM32H742AG.json
index a3f5396..09bd662 100644
--- a/data/chips/STM32H742AG.json
+++ b/data/chips/STM32H742AG.json
@@ -430,6 +430,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -702,15 +711,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -788,7 +788,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2869,7 +2875,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2878,7 +2884,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742AI.json b/data/chips/STM32H742AI.json
index ec6e5a4..6e156db 100644
--- a/data/chips/STM32H742AI.json
+++ b/data/chips/STM32H742AI.json
@@ -441,6 +441,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -713,15 +722,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -799,7 +799,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2880,7 +2886,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2889,7 +2895,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742BG.json b/data/chips/STM32H742BG.json
index b2e6857..2eb04ee 100644
--- a/data/chips/STM32H742BG.json
+++ b/data/chips/STM32H742BG.json
@@ -430,6 +430,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -702,15 +711,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -788,7 +788,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2994,7 +3000,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3003,7 +3009,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742BI.json b/data/chips/STM32H742BI.json
index 05ab9bf..5008ff7 100644
--- a/data/chips/STM32H742BI.json
+++ b/data/chips/STM32H742BI.json
@@ -441,6 +441,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -713,15 +722,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -799,7 +799,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3005,7 +3011,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3014,7 +3020,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742IG.json b/data/chips/STM32H742IG.json
index f2308f8..a11b7f2 100644
--- a/data/chips/STM32H742IG.json
+++ b/data/chips/STM32H742IG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -706,15 +715,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -792,7 +792,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2993,7 +2999,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3002,7 +3008,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742II.json b/data/chips/STM32H742II.json
index 3c1d40f..3b33ced 100644
--- a/data/chips/STM32H742II.json
+++ b/data/chips/STM32H742II.json
@@ -445,6 +445,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -717,15 +726,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -803,7 +803,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3004,7 +3010,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3013,7 +3019,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742VG.json b/data/chips/STM32H742VG.json
index 10bd586..464d486 100644
--- a/data/chips/STM32H742VG.json
+++ b/data/chips/STM32H742VG.json
@@ -422,6 +422,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -606,15 +615,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -692,7 +692,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2433,7 +2439,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2442,7 +2448,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742VI.json b/data/chips/STM32H742VI.json
index 81e14d7..bc67367 100644
--- a/data/chips/STM32H742VI.json
+++ b/data/chips/STM32H742VI.json
@@ -433,6 +433,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -617,15 +626,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -703,7 +703,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2444,7 +2450,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2453,7 +2459,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742XG.json b/data/chips/STM32H742XG.json
index 10af4c6..34393b8 100644
--- a/data/chips/STM32H742XG.json
+++ b/data/chips/STM32H742XG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -766,15 +775,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -852,7 +852,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3058,7 +3064,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3067,7 +3073,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742XI.json b/data/chips/STM32H742XI.json
index 19795f4..9dd9e14 100644
--- a/data/chips/STM32H742XI.json
+++ b/data/chips/STM32H742XI.json
@@ -469,6 +469,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -777,15 +786,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -863,7 +863,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3069,7 +3075,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3078,7 +3084,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742ZG.json b/data/chips/STM32H742ZG.json
index 483b364..44122fa 100644
--- a/data/chips/STM32H742ZG.json
+++ b/data/chips/STM32H742ZG.json
@@ -430,6 +430,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -674,15 +683,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -760,7 +760,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2721,7 +2727,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2730,7 +2736,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H742ZI.json b/data/chips/STM32H742ZI.json
index 0da292e..98360d3 100644
--- a/data/chips/STM32H742ZI.json
+++ b/data/chips/STM32H742ZI.json
@@ -441,6 +441,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -685,15 +694,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -771,7 +771,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2732,7 +2738,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2741,7 +2747,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743AG.json b/data/chips/STM32H743AG.json
index a2055ca..7b329e8 100644
--- a/data/chips/STM32H743AG.json
+++ b/data/chips/STM32H743AG.json
@@ -472,6 +472,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -744,15 +753,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -830,7 +830,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2911,7 +2917,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2920,7 +2926,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743AI.json b/data/chips/STM32H743AI.json
index 1889628..8f0e49b 100644
--- a/data/chips/STM32H743AI.json
+++ b/data/chips/STM32H743AI.json
@@ -483,6 +483,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -755,15 +764,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -841,7 +841,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2922,7 +2928,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2931,7 +2937,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743BG.json b/data/chips/STM32H743BG.json
index 0bdc43a..321c41e 100644
--- a/data/chips/STM32H743BG.json
+++ b/data/chips/STM32H743BG.json
@@ -472,6 +472,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -744,15 +753,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -830,7 +830,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3036,7 +3042,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3045,7 +3051,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743BI.json b/data/chips/STM32H743BI.json
index 0a234a1..753004b 100644
--- a/data/chips/STM32H743BI.json
+++ b/data/chips/STM32H743BI.json
@@ -483,6 +483,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -755,15 +764,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -841,7 +841,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3047,7 +3053,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3056,7 +3062,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743IG.json b/data/chips/STM32H743IG.json
index 9215134..1186982 100644
--- a/data/chips/STM32H743IG.json
+++ b/data/chips/STM32H743IG.json
@@ -476,6 +476,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -748,15 +757,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -834,7 +834,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3035,7 +3041,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3044,7 +3050,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743II.json b/data/chips/STM32H743II.json
index 0a7f178..6ea85a5 100644
--- a/data/chips/STM32H743II.json
+++ b/data/chips/STM32H743II.json
@@ -487,6 +487,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -759,15 +768,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -845,7 +845,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3046,7 +3052,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3055,7 +3061,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743VG.json b/data/chips/STM32H743VG.json
index 8618dee..15e30c9 100644
--- a/data/chips/STM32H743VG.json
+++ b/data/chips/STM32H743VG.json
@@ -464,6 +464,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -648,15 +657,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -734,7 +734,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2475,7 +2481,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2484,7 +2490,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743VI.json b/data/chips/STM32H743VI.json
index c4bfe2a..a90af30 100644
--- a/data/chips/STM32H743VI.json
+++ b/data/chips/STM32H743VI.json
@@ -475,6 +475,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -659,15 +668,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -745,7 +745,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2486,7 +2492,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2495,7 +2501,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743XG.json b/data/chips/STM32H743XG.json
index 0c6586d..bf7241a 100644
--- a/data/chips/STM32H743XG.json
+++ b/data/chips/STM32H743XG.json
@@ -500,6 +500,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -808,15 +817,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -894,7 +894,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3100,7 +3106,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3109,7 +3115,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743XI.json b/data/chips/STM32H743XI.json
index 3e2edcb..3d46659 100644
--- a/data/chips/STM32H743XI.json
+++ b/data/chips/STM32H743XI.json
@@ -511,6 +511,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -819,15 +828,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -905,7 +905,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3111,7 +3117,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3120,7 +3126,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743ZG.json b/data/chips/STM32H743ZG.json
index 75d8308..0a512e3 100644
--- a/data/chips/STM32H743ZG.json
+++ b/data/chips/STM32H743ZG.json
@@ -472,6 +472,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -716,15 +725,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -802,7 +802,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2763,7 +2769,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2772,7 +2778,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H743ZI.json b/data/chips/STM32H743ZI.json
index e9f72fa..0822b55 100644
--- a/data/chips/STM32H743ZI.json
+++ b/data/chips/STM32H743ZI.json
@@ -483,6 +483,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -727,15 +736,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -813,7 +813,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2774,7 +2780,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2783,7 +2789,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H745BG.json b/data/chips/STM32H745BG.json
index 9020efc..4191760 100644
--- a/data/chips/STM32H745BG.json
+++ b/data/chips/STM32H745BG.json
@@ -454,6 +454,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -726,15 +735,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -812,7 +812,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3013,7 +3019,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3022,7 +3028,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10325,6 +10331,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10597,15 +10612,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10683,7 +10689,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12884,7 +12896,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12893,7 +12905,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H745BI.json b/data/chips/STM32H745BI.json
index a9b1b9f..88a2f8b 100644
--- a/data/chips/STM32H745BI.json
+++ b/data/chips/STM32H745BI.json
@@ -465,6 +465,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -737,15 +746,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -823,7 +823,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3024,7 +3030,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3033,7 +3039,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10336,6 +10342,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10608,15 +10623,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10694,7 +10700,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12895,7 +12907,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12904,7 +12916,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H745IG.json b/data/chips/STM32H745IG.json
index fe224a6..2260b9e 100644
--- a/data/chips/STM32H745IG.json
+++ b/data/chips/STM32H745IG.json
@@ -486,6 +486,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -794,15 +803,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -880,7 +880,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2981,7 +2987,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2990,7 +2996,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10099,6 +10105,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10407,15 +10422,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10493,7 +10499,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12594,7 +12606,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12603,7 +12615,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H745II.json b/data/chips/STM32H745II.json
index dd5ff99..40cbf1f 100644
--- a/data/chips/STM32H745II.json
+++ b/data/chips/STM32H745II.json
@@ -497,6 +497,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -805,15 +814,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -891,7 +891,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2992,7 +2998,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3001,7 +3007,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10110,6 +10116,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10418,15 +10433,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10504,7 +10510,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12605,7 +12617,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12614,7 +12626,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H745XG.json b/data/chips/STM32H745XG.json
index 35ea33a..448c532 100644
--- a/data/chips/STM32H745XG.json
+++ b/data/chips/STM32H745XG.json
@@ -482,6 +482,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -790,15 +799,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -876,7 +876,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3082,7 +3088,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3091,7 +3097,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10527,6 +10533,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10835,15 +10850,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10921,7 +10927,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -13127,7 +13139,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -13136,7 +13148,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H745XI.json b/data/chips/STM32H745XI.json
index 46286a4..d739dc3 100644
--- a/data/chips/STM32H745XI.json
+++ b/data/chips/STM32H745XI.json
@@ -493,6 +493,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -801,15 +810,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -887,7 +887,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3093,7 +3099,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3102,7 +3108,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10538,6 +10544,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10846,15 +10861,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10932,7 +10938,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -13138,7 +13150,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -13147,7 +13159,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H745ZG.json b/data/chips/STM32H745ZG.json
index 5659d3c..de7a086 100644
--- a/data/chips/STM32H745ZG.json
+++ b/data/chips/STM32H745ZG.json
@@ -446,6 +446,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -666,15 +675,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -752,7 +752,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2618,7 +2624,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2627,7 +2633,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9252,6 +9258,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9472,15 +9487,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9558,7 +9564,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11424,7 +11436,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11433,7 +11445,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H745ZI.json b/data/chips/STM32H745ZI.json
index a2bb7d7..67101f1 100644
--- a/data/chips/STM32H745ZI.json
+++ b/data/chips/STM32H745ZI.json
@@ -457,6 +457,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -677,15 +686,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -763,7 +763,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2629,7 +2635,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2638,7 +2644,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9263,6 +9269,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9483,15 +9498,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9569,7 +9575,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11435,7 +11447,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11444,7 +11456,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747AG.json b/data/chips/STM32H747AG.json
index 51e418f..8e8e213 100644
--- a/data/chips/STM32H747AG.json
+++ b/data/chips/STM32H747AG.json
@@ -460,6 +460,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -704,15 +713,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -790,7 +790,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2793,7 +2799,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2802,7 +2808,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9527,6 +9533,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9771,15 +9786,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9857,7 +9863,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11860,7 +11872,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11869,7 +11881,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747AI.json b/data/chips/STM32H747AI.json
index 56fe5bf..36cba3f 100644
--- a/data/chips/STM32H747AI.json
+++ b/data/chips/STM32H747AI.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -715,15 +724,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -801,7 +801,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2804,7 +2810,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2813,7 +2819,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9538,6 +9544,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9782,15 +9797,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9868,7 +9874,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11871,7 +11883,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11880,7 +11892,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747BG.json b/data/chips/STM32H747BG.json
index f5cad90..eb7e17a 100644
--- a/data/chips/STM32H747BG.json
+++ b/data/chips/STM32H747BG.json
@@ -460,6 +460,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -732,15 +741,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -818,7 +818,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3061,7 +3067,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3070,7 +3076,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10202,6 +10208,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10474,15 +10489,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10560,7 +10566,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12803,7 +12815,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12812,7 +12824,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747BI.json b/data/chips/STM32H747BI.json
index c3dbc07..dba698b 100644
--- a/data/chips/STM32H747BI.json
+++ b/data/chips/STM32H747BI.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -743,15 +752,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -829,7 +829,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3072,7 +3078,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3081,7 +3087,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10213,6 +10219,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10485,15 +10500,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10571,7 +10577,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12814,7 +12826,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12823,7 +12835,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747IG.json b/data/chips/STM32H747IG.json
index cc2e6c8..45fcdd5 100644
--- a/data/chips/STM32H747IG.json
+++ b/data/chips/STM32H747IG.json
@@ -460,6 +460,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -704,15 +713,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -790,7 +790,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2793,7 +2799,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2802,7 +2808,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9527,6 +9533,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9771,15 +9786,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9857,7 +9863,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11860,7 +11872,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11869,7 +11881,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747II.json b/data/chips/STM32H747II.json
index 729a4a6..9a9ae8c 100644
--- a/data/chips/STM32H747II.json
+++ b/data/chips/STM32H747II.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -715,15 +724,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -801,7 +801,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2804,7 +2810,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2813,7 +2819,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9538,6 +9544,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9782,15 +9797,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9868,7 +9874,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11871,7 +11883,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11880,7 +11892,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747XG.json b/data/chips/STM32H747XG.json
index ba42c7c..e209fea 100644
--- a/data/chips/STM32H747XG.json
+++ b/data/chips/STM32H747XG.json
@@ -488,6 +488,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -796,15 +805,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -882,7 +882,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3135,7 +3141,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3144,7 +3150,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10584,6 +10590,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10892,15 +10907,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10978,7 +10984,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -13231,7 +13243,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -13240,7 +13252,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747XI.json b/data/chips/STM32H747XI.json
index ada6721..7b90cd5 100644
--- a/data/chips/STM32H747XI.json
+++ b/data/chips/STM32H747XI.json
@@ -499,6 +499,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -807,15 +816,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -893,7 +893,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3146,7 +3152,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3155,7 +3161,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10595,6 +10601,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10903,15 +10918,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10989,7 +10995,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -13242,7 +13254,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -13251,7 +13263,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H747ZI.json b/data/chips/STM32H747ZI.json
index 6b2ccbd..97361a2 100644
--- a/data/chips/STM32H747ZI.json
+++ b/data/chips/STM32H747ZI.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -683,15 +692,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -769,7 +769,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2682,7 +2688,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2691,7 +2697,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -8995,6 +9001,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9207,15 +9222,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9293,7 +9299,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11206,7 +11218,7 @@
                     }
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11215,7 +11227,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H750IB.json b/data/chips/STM32H750IB.json
index 8069c67..32cd4d3 100644
--- a/data/chips/STM32H750IB.json
+++ b/data/chips/STM32H750IB.json
@@ -464,6 +464,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -736,15 +745,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -822,7 +822,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3096,7 +3102,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3105,7 +3111,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H750VB.json b/data/chips/STM32H750VB.json
index 00f24e1..a10bc45 100644
--- a/data/chips/STM32H750VB.json
+++ b/data/chips/STM32H750VB.json
@@ -448,6 +448,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -632,15 +641,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -718,7 +718,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2532,7 +2538,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2541,7 +2547,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H750XB.json b/data/chips/STM32H750XB.json
index 948c959..665e2c3 100644
--- a/data/chips/STM32H750XB.json
+++ b/data/chips/STM32H750XB.json
@@ -488,6 +488,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -796,15 +805,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -882,7 +882,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3161,7 +3167,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3170,7 +3176,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H750ZB.json b/data/chips/STM32H750ZB.json
index 80f5896..0590261 100644
--- a/data/chips/STM32H750ZB.json
+++ b/data/chips/STM32H750ZB.json
@@ -448,6 +448,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -692,15 +701,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -778,7 +778,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2812,7 +2818,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2821,7 +2827,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H753AI.json b/data/chips/STM32H753AI.json
index 4d8e451..8db8f4a 100644
--- a/data/chips/STM32H753AI.json
+++ b/data/chips/STM32H753AI.json
@@ -489,6 +489,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -761,15 +770,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -847,7 +847,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3001,7 +3007,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3010,7 +3016,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H753BI.json b/data/chips/STM32H753BI.json
index fc3891c..959903e 100644
--- a/data/chips/STM32H753BI.json
+++ b/data/chips/STM32H753BI.json
@@ -489,6 +489,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -761,15 +770,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -847,7 +847,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3126,7 +3132,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3135,7 +3141,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H753II.json b/data/chips/STM32H753II.json
index c4978a6..714855f 100644
--- a/data/chips/STM32H753II.json
+++ b/data/chips/STM32H753II.json
@@ -493,6 +493,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -765,15 +774,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -851,7 +851,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3125,7 +3131,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3134,7 +3140,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H753VI.json b/data/chips/STM32H753VI.json
index 4b18def..057e935 100644
--- a/data/chips/STM32H753VI.json
+++ b/data/chips/STM32H753VI.json
@@ -481,6 +481,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -665,15 +674,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -751,7 +751,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2565,7 +2571,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2574,7 +2580,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H753XI.json b/data/chips/STM32H753XI.json
index 369bace..de2bee6 100644
--- a/data/chips/STM32H753XI.json
+++ b/data/chips/STM32H753XI.json
@@ -517,6 +517,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -825,15 +834,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -911,7 +911,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3190,7 +3196,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3199,7 +3205,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H753ZI.json b/data/chips/STM32H753ZI.json
index 1c9ba37..cd14c30 100644
--- a/data/chips/STM32H753ZI.json
+++ b/data/chips/STM32H753ZI.json
@@ -489,6 +489,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -733,15 +742,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -819,7 +819,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2853,7 +2859,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2862,7 +2868,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H755BI.json b/data/chips/STM32H755BI.json
index 0247ff5..cf42b12 100644
--- a/data/chips/STM32H755BI.json
+++ b/data/chips/STM32H755BI.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -743,15 +752,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -829,7 +829,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3103,7 +3109,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3112,7 +3118,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10419,6 +10425,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10691,15 +10706,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10777,7 +10783,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -13051,7 +13063,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -13060,7 +13072,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H755II.json b/data/chips/STM32H755II.json
index cb9117e..2b82710 100644
--- a/data/chips/STM32H755II.json
+++ b/data/chips/STM32H755II.json
@@ -503,6 +503,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -811,15 +820,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -897,7 +897,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3071,7 +3077,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3080,7 +3086,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10193,6 +10199,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10501,15 +10516,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10587,7 +10593,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12761,7 +12773,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12770,7 +12782,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H755XI.json b/data/chips/STM32H755XI.json
index 0deae0a..9886722 100644
--- a/data/chips/STM32H755XI.json
+++ b/data/chips/STM32H755XI.json
@@ -499,6 +499,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -807,15 +816,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -893,7 +893,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3172,7 +3178,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3181,7 +3187,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10621,6 +10627,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10929,15 +10944,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -11015,7 +11021,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -13294,7 +13306,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -13303,7 +13315,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H755ZI.json b/data/chips/STM32H755ZI.json
index 0322932..0c0c02c 100644
--- a/data/chips/STM32H755ZI.json
+++ b/data/chips/STM32H755ZI.json
@@ -463,6 +463,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -683,15 +692,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -769,7 +769,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2708,7 +2714,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2717,7 +2723,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9346,6 +9352,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9566,15 +9581,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9652,7 +9658,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11591,7 +11603,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11600,7 +11612,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H757AI.json b/data/chips/STM32H757AI.json
index f13e6ca..2486aec 100644
--- a/data/chips/STM32H757AI.json
+++ b/data/chips/STM32H757AI.json
@@ -477,6 +477,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -721,15 +730,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -807,7 +807,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2883,7 +2889,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2892,7 +2898,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9621,6 +9627,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9865,15 +9880,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9951,7 +9957,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12027,7 +12039,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12036,7 +12048,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H757BI.json b/data/chips/STM32H757BI.json
index 3c32f47..4931e1f 100644
--- a/data/chips/STM32H757BI.json
+++ b/data/chips/STM32H757BI.json
@@ -477,6 +477,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -749,15 +758,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -835,7 +835,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3151,7 +3157,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3160,7 +3166,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10296,6 +10302,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10568,15 +10583,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -10654,7 +10660,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12970,7 +12982,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12979,7 +12991,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H757II.json b/data/chips/STM32H757II.json
index ac2d568..cb01076 100644
--- a/data/chips/STM32H757II.json
+++ b/data/chips/STM32H757II.json
@@ -477,6 +477,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -721,15 +730,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -807,7 +807,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2883,7 +2889,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2892,7 +2898,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9621,6 +9627,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9865,15 +9880,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9951,7 +9957,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -12027,7 +12039,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -12036,7 +12048,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H757XI.json b/data/chips/STM32H757XI.json
index b65b401..5377ab0 100644
--- a/data/chips/STM32H757XI.json
+++ b/data/chips/STM32H757XI.json
@@ -505,6 +505,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -813,15 +822,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -899,7 +899,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -3225,7 +3231,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -3234,7 +3240,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -10678,6 +10684,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -10986,15 +11001,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -11072,7 +11078,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -13398,7 +13410,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -13407,7 +13419,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H757ZI.json b/data/chips/STM32H757ZI.json
index 6ba8b67..d741753 100644
--- a/data/chips/STM32H757ZI.json
+++ b/data/chips/STM32H757ZI.json
@@ -477,6 +477,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -689,15 +698,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -775,7 +775,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -2761,7 +2767,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -2770,7 +2776,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
@@ -9078,6 +9084,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -9290,15 +9305,6 @@
                         "block": "ADC_COMMON"
                     }
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA",
                     "address": 1476547584,
@@ -9376,7 +9382,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
@@ -11362,7 +11374,7 @@
                     ]
                 },
                 {
-                    "name": "HRTIM",
+                    "name": "HRTIM1",
                     "address": 1073837056,
                     "registers": {
                         "kind": "hrtim",
@@ -11371,7 +11383,7 @@
                     },
                     "rcc": {
                         "bus_clock": "PCLK2",
-                        "kernel_clock": "PCLK2",
+                        "kernel_clock": "PCLK2_TIM",
                         "enable": {
                             "register": "APB2ENR",
                             "field": "HRTIMEN"
diff --git a/data/chips/STM32H7A3AG.json b/data/chips/STM32H7A3AG.json
index 374166e..cbb769e 100644
--- a/data/chips/STM32H7A3AG.json
+++ b/data/chips/STM32H7A3AG.json
@@ -458,6 +458,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -585,15 +594,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -726,7 +726,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3AI.json b/data/chips/STM32H7A3AI.json
index 3e6b145..1acfc8d 100644
--- a/data/chips/STM32H7A3AI.json
+++ b/data/chips/STM32H7A3AI.json
@@ -469,6 +469,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -596,15 +605,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -737,7 +737,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3IG.json b/data/chips/STM32H7A3IG.json
index 6e76a8e..9feccaf 100644
--- a/data/chips/STM32H7A3IG.json
+++ b/data/chips/STM32H7A3IG.json
@@ -470,6 +470,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -597,15 +606,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -738,7 +738,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3II.json b/data/chips/STM32H7A3II.json
index 158402c..48d1f72 100644
--- a/data/chips/STM32H7A3II.json
+++ b/data/chips/STM32H7A3II.json
@@ -481,6 +481,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -608,15 +617,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -749,7 +749,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3LG.json b/data/chips/STM32H7A3LG.json
index da5cdf9..79fcebf 100644
--- a/data/chips/STM32H7A3LG.json
+++ b/data/chips/STM32H7A3LG.json
@@ -452,6 +452,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -579,15 +588,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -720,7 +720,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3LI.json b/data/chips/STM32H7A3LI.json
index f09cf41..34467f4 100644
--- a/data/chips/STM32H7A3LI.json
+++ b/data/chips/STM32H7A3LI.json
@@ -469,6 +469,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -596,15 +605,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -737,7 +737,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3NG.json b/data/chips/STM32H7A3NG.json
index bd739e3..9a27b2b 100644
--- a/data/chips/STM32H7A3NG.json
+++ b/data/chips/STM32H7A3NG.json
@@ -430,6 +430,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -541,15 +550,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -682,7 +682,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3NI.json b/data/chips/STM32H7A3NI.json
index da4eeff..2d79230 100644
--- a/data/chips/STM32H7A3NI.json
+++ b/data/chips/STM32H7A3NI.json
@@ -441,6 +441,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -552,15 +561,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -693,7 +693,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3QI.json b/data/chips/STM32H7A3QI.json
index e1daf04..157c68e 100644
--- a/data/chips/STM32H7A3QI.json
+++ b/data/chips/STM32H7A3QI.json
@@ -445,6 +445,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -556,15 +565,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -697,7 +697,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3RG.json b/data/chips/STM32H7A3RG.json
index 21f57ac..a35294b 100644
--- a/data/chips/STM32H7A3RG.json
+++ b/data/chips/STM32H7A3RG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -537,15 +546,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -678,7 +678,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3RI.json b/data/chips/STM32H7A3RI.json
index 9cb69c8..15cf26e 100644
--- a/data/chips/STM32H7A3RI.json
+++ b/data/chips/STM32H7A3RI.json
@@ -445,6 +445,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -548,15 +557,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -689,7 +689,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3VG.json b/data/chips/STM32H7A3VG.json
index 7de83de..bdf4b7e 100644
--- a/data/chips/STM32H7A3VG.json
+++ b/data/chips/STM32H7A3VG.json
@@ -430,6 +430,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -529,15 +538,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -670,7 +670,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3VI.json b/data/chips/STM32H7A3VI.json
index de5fd43..82427ae 100644
--- a/data/chips/STM32H7A3VI.json
+++ b/data/chips/STM32H7A3VI.json
@@ -441,6 +441,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -540,15 +549,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -681,7 +681,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3ZG.json b/data/chips/STM32H7A3ZG.json
index 8ceb09c..72949eb 100644
--- a/data/chips/STM32H7A3ZG.json
+++ b/data/chips/STM32H7A3ZG.json
@@ -434,6 +434,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -545,15 +554,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -686,7 +686,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7A3ZI.json b/data/chips/STM32H7A3ZI.json
index 3eeb1ed..150d410 100644
--- a/data/chips/STM32H7A3ZI.json
+++ b/data/chips/STM32H7A3ZI.json
@@ -445,6 +445,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -556,15 +565,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -697,7 +697,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B0AB.json b/data/chips/STM32H7B0AB.json
index 3051123..9a706ad 100644
--- a/data/chips/STM32H7B0AB.json
+++ b/data/chips/STM32H7B0AB.json
@@ -464,6 +464,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -591,15 +600,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -732,7 +732,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B0IB.json b/data/chips/STM32H7B0IB.json
index 4ba9b4e..9a22240 100644
--- a/data/chips/STM32H7B0IB.json
+++ b/data/chips/STM32H7B0IB.json
@@ -468,6 +468,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -595,15 +604,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -736,7 +736,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B0RB.json b/data/chips/STM32H7B0RB.json
index 13467d4..960c719 100644
--- a/data/chips/STM32H7B0RB.json
+++ b/data/chips/STM32H7B0RB.json
@@ -440,6 +440,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -543,15 +552,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -684,7 +684,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B0VB.json b/data/chips/STM32H7B0VB.json
index a45fa34..3b3eb40 100644
--- a/data/chips/STM32H7B0VB.json
+++ b/data/chips/STM32H7B0VB.json
@@ -424,6 +424,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -523,15 +532,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -664,7 +664,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B0ZB.json b/data/chips/STM32H7B0ZB.json
index d5099c1..1ec56ff 100644
--- a/data/chips/STM32H7B0ZB.json
+++ b/data/chips/STM32H7B0ZB.json
@@ -436,6 +436,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -547,15 +556,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -688,7 +688,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B3AI.json b/data/chips/STM32H7B3AI.json
index cff1904..5589b76 100644
--- a/data/chips/STM32H7B3AI.json
+++ b/data/chips/STM32H7B3AI.json
@@ -481,6 +481,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -608,15 +617,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -749,7 +749,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B3II.json b/data/chips/STM32H7B3II.json
index fc88750..7c4563c 100644
--- a/data/chips/STM32H7B3II.json
+++ b/data/chips/STM32H7B3II.json
@@ -493,6 +493,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -620,15 +629,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -761,7 +761,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B3LI.json b/data/chips/STM32H7B3LI.json
index 09a15be..3c4163a 100644
--- a/data/chips/STM32H7B3LI.json
+++ b/data/chips/STM32H7B3LI.json
@@ -481,6 +481,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -608,15 +617,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -749,7 +749,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B3NI.json b/data/chips/STM32H7B3NI.json
index b34cdeb..8d33873 100644
--- a/data/chips/STM32H7B3NI.json
+++ b/data/chips/STM32H7B3NI.json
@@ -453,6 +453,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -564,15 +573,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -705,7 +705,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B3QI.json b/data/chips/STM32H7B3QI.json
index 5a41103..2a1fcc8 100644
--- a/data/chips/STM32H7B3QI.json
+++ b/data/chips/STM32H7B3QI.json
@@ -457,6 +457,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -568,15 +577,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -709,7 +709,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B3RI.json b/data/chips/STM32H7B3RI.json
index 24f6a1c..bc0e89a 100644
--- a/data/chips/STM32H7B3RI.json
+++ b/data/chips/STM32H7B3RI.json
@@ -457,6 +457,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -560,15 +569,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -701,7 +701,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B3VI.json b/data/chips/STM32H7B3VI.json
index 40e52da..f136d55 100644
--- a/data/chips/STM32H7B3VI.json
+++ b/data/chips/STM32H7B3VI.json
@@ -453,6 +453,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -552,15 +561,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -693,7 +693,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32H7B3ZI.json b/data/chips/STM32H7B3ZI.json
index c79f6ff..0d1d793 100644
--- a/data/chips/STM32H7B3ZI.json
+++ b/data/chips/STM32H7B3ZI.json
@@ -457,6 +457,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1073881856,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v4",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1073881344,
@@ -568,15 +577,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1073881856,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v4",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "BDMA1",
                     "address": 1208101888,
@@ -709,7 +709,13 @@
                             "register": "APB1LRSTR",
                             "field": "CECRST"
                         }
-                    }
+                    },
+                    "interrupts": [
+                        {
+                            "signal": "GLOBAL",
+                            "interrupt": "CEC"
+                        }
+                    ]
                 },
                 {
                     "name": "COMP1",
diff --git a/data/chips/STM32L010C6.json b/data/chips/STM32L010C6.json
index 90275d4..5e390db 100644
--- a/data/chips/STM32L010C6.json
+++ b/data/chips/STM32L010C6.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L010F4.json b/data/chips/STM32L010F4.json
index 8c72449..0e07ff2 100644
--- a/data/chips/STM32L010F4.json
+++ b/data/chips/STM32L010F4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -400,7 +400,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L010K4.json b/data/chips/STM32L010K4.json
index 3beede4..1e7b72c 100644
--- a/data/chips/STM32L010K4.json
+++ b/data/chips/STM32L010K4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L010K8.json b/data/chips/STM32L010K8.json
index ec3d075..4a4dc62 100644
--- a/data/chips/STM32L010K8.json
+++ b/data/chips/STM32L010K8.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L010R8.json b/data/chips/STM32L010R8.json
index b199e4d..7679371 100644
--- a/data/chips/STM32L010R8.json
+++ b/data/chips/STM32L010R8.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -423,7 +423,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L010RB.json b/data/chips/STM32L010RB.json
index 6d8c776..e68a868 100644
--- a/data/chips/STM32L010RB.json
+++ b/data/chips/STM32L010RB.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -423,7 +423,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011D3.json b/data/chips/STM32L011D3.json
index ae192d6..e638520 100644
--- a/data/chips/STM32L011D3.json
+++ b/data/chips/STM32L011D3.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -380,7 +380,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011D4.json b/data/chips/STM32L011D4.json
index 652c00a..8fc03ad 100644
--- a/data/chips/STM32L011D4.json
+++ b/data/chips/STM32L011D4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -380,7 +380,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011E3.json b/data/chips/STM32L011E3.json
index 29fdbc3..29abb8b 100644
--- a/data/chips/STM32L011E3.json
+++ b/data/chips/STM32L011E3.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011E4.json b/data/chips/STM32L011E4.json
index 272ba91..968af22 100644
--- a/data/chips/STM32L011E4.json
+++ b/data/chips/STM32L011E4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011F3.json b/data/chips/STM32L011F3.json
index 6bfedbb..e3db620 100644
--- a/data/chips/STM32L011F3.json
+++ b/data/chips/STM32L011F3.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011F4.json b/data/chips/STM32L011F4.json
index 19f3bf2..1f92381 100644
--- a/data/chips/STM32L011F4.json
+++ b/data/chips/STM32L011F4.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011G3.json b/data/chips/STM32L011G3.json
index 18e3148..b515f52 100644
--- a/data/chips/STM32L011G3.json
+++ b/data/chips/STM32L011G3.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011G4.json b/data/chips/STM32L011G4.json
index 18c0cb2..664caf3 100644
--- a/data/chips/STM32L011G4.json
+++ b/data/chips/STM32L011G4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011K3.json b/data/chips/STM32L011K3.json
index 42da70a..53e0e2b 100644
--- a/data/chips/STM32L011K3.json
+++ b/data/chips/STM32L011K3.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -408,7 +408,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L011K4.json b/data/chips/STM32L011K4.json
index 2e9711f..d89f079 100644
--- a/data/chips/STM32L011K4.json
+++ b/data/chips/STM32L011K4.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -408,7 +408,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L021D4.json b/data/chips/STM32L021D4.json
index 71a7d9d..48f0ff1 100644
--- a/data/chips/STM32L021D4.json
+++ b/data/chips/STM32L021D4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -380,7 +380,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L021F4.json b/data/chips/STM32L021F4.json
index ce3fac4..59e2481 100644
--- a/data/chips/STM32L021F4.json
+++ b/data/chips/STM32L021F4.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L021G4.json b/data/chips/STM32L021G4.json
index 989dc5a..b83d1be 100644
--- a/data/chips/STM32L021G4.json
+++ b/data/chips/STM32L021G4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -404,7 +404,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L021K4.json b/data/chips/STM32L021K4.json
index ce4bdea..6d9bcce 100644
--- a/data/chips/STM32L021K4.json
+++ b/data/chips/STM32L021K4.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -408,7 +408,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031C4.json b/data/chips/STM32L031C4.json
index 45151f0..a46b2ff 100644
--- a/data/chips/STM32L031C4.json
+++ b/data/chips/STM32L031C4.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031C6.json b/data/chips/STM32L031C6.json
index 6e8ea65..de6f2bb 100644
--- a/data/chips/STM32L031C6.json
+++ b/data/chips/STM32L031C6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031E4.json b/data/chips/STM32L031E4.json
index 17475a9..b09f2ed 100644
--- a/data/chips/STM32L031E4.json
+++ b/data/chips/STM32L031E4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031E6.json b/data/chips/STM32L031E6.json
index 74c7051..ec8a92b 100644
--- a/data/chips/STM32L031E6.json
+++ b/data/chips/STM32L031E6.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031F4.json b/data/chips/STM32L031F4.json
index 79259ff..48875f5 100644
--- a/data/chips/STM32L031F4.json
+++ b/data/chips/STM32L031F4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031F6.json b/data/chips/STM32L031F6.json
index a72c6dd..ef02c15 100644
--- a/data/chips/STM32L031F6.json
+++ b/data/chips/STM32L031F6.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031G4.json b/data/chips/STM32L031G4.json
index 7322298..6b3949e 100644
--- a/data/chips/STM32L031G4.json
+++ b/data/chips/STM32L031G4.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031G6.json b/data/chips/STM32L031G6.json
index c9931ea..478ec8a 100644
--- a/data/chips/STM32L031G6.json
+++ b/data/chips/STM32L031G6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031K4.json b/data/chips/STM32L031K4.json
index 96990ce..4055f5f 100644
--- a/data/chips/STM32L031K4.json
+++ b/data/chips/STM32L031K4.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L031K6.json b/data/chips/STM32L031K6.json
index 5568f99..1a75cb5 100644
--- a/data/chips/STM32L031K6.json
+++ b/data/chips/STM32L031K6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L041C4.json b/data/chips/STM32L041C4.json
index 57cd515..0dfd531 100644
--- a/data/chips/STM32L041C4.json
+++ b/data/chips/STM32L041C4.json
@@ -35,7 +35,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -116,7 +116,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L041C6.json b/data/chips/STM32L041C6.json
index 4fd2afd..215fcd9 100644
--- a/data/chips/STM32L041C6.json
+++ b/data/chips/STM32L041C6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L041E6.json b/data/chips/STM32L041E6.json
index 93c6ce7..63db0e3 100644
--- a/data/chips/STM32L041E6.json
+++ b/data/chips/STM32L041E6.json
@@ -312,7 +312,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -393,7 +393,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L041F6.json b/data/chips/STM32L041F6.json
index 25562f9..0426130 100644
--- a/data/chips/STM32L041F6.json
+++ b/data/chips/STM32L041F6.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L041G6.json b/data/chips/STM32L041G6.json
index 1dd6589..353eaca 100644
--- a/data/chips/STM32L041G6.json
+++ b/data/chips/STM32L041G6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L041K6.json b/data/chips/STM32L041K6.json
index 15ef9b8..eacd8fc 100644
--- a/data/chips/STM32L041K6.json
+++ b/data/chips/STM32L041K6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L051C6.json b/data/chips/STM32L051C6.json
index c23d35b..b17fb5b 100644
--- a/data/chips/STM32L051C6.json
+++ b/data/chips/STM32L051C6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L051C8.json b/data/chips/STM32L051C8.json
index 139500e..c4e706e 100644
--- a/data/chips/STM32L051C8.json
+++ b/data/chips/STM32L051C8.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L051K6.json b/data/chips/STM32L051K6.json
index 4bc9bad..3e250a3 100644
--- a/data/chips/STM32L051K6.json
+++ b/data/chips/STM32L051K6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L051K8.json b/data/chips/STM32L051K8.json
index fee18fe..c880285 100644
--- a/data/chips/STM32L051K8.json
+++ b/data/chips/STM32L051K8.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L051R6.json b/data/chips/STM32L051R6.json
index d09bb94..a7c669c 100644
--- a/data/chips/STM32L051R6.json
+++ b/data/chips/STM32L051R6.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L051R8.json b/data/chips/STM32L051R8.json
index 23facb5..1400625 100644
--- a/data/chips/STM32L051R8.json
+++ b/data/chips/STM32L051R8.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L051T6.json b/data/chips/STM32L051T6.json
index 2094d48..bda2de3 100644
--- a/data/chips/STM32L051T6.json
+++ b/data/chips/STM32L051T6.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L051T8.json b/data/chips/STM32L051T8.json
index 3916447..ce226f3 100644
--- a/data/chips/STM32L051T8.json
+++ b/data/chips/STM32L051T8.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L052C6.json b/data/chips/STM32L052C6.json
index e6f6522..73a9f91 100644
--- a/data/chips/STM32L052C6.json
+++ b/data/chips/STM32L052C6.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L052C8.json b/data/chips/STM32L052C8.json
index bf3ece3..36a74e9 100644
--- a/data/chips/STM32L052C8.json
+++ b/data/chips/STM32L052C8.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L052K6.json b/data/chips/STM32L052K6.json
index be8913c..7926659 100644
--- a/data/chips/STM32L052K6.json
+++ b/data/chips/STM32L052K6.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L052K8.json b/data/chips/STM32L052K8.json
index c7df320..11c42af 100644
--- a/data/chips/STM32L052K8.json
+++ b/data/chips/STM32L052K8.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L052R6.json b/data/chips/STM32L052R6.json
index a9f8f37..0ec16fa 100644
--- a/data/chips/STM32L052R6.json
+++ b/data/chips/STM32L052R6.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -439,7 +439,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L052R8.json b/data/chips/STM32L052R8.json
index 5aa1679..2d9f2ef 100644
--- a/data/chips/STM32L052R8.json
+++ b/data/chips/STM32L052R8.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -439,7 +439,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L052T6.json b/data/chips/STM32L052T6.json
index f6a49a8..9f8f44d 100644
--- a/data/chips/STM32L052T6.json
+++ b/data/chips/STM32L052T6.json
@@ -330,7 +330,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -411,7 +411,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L052T8.json b/data/chips/STM32L052T8.json
index 1b0e2ef..636e353 100644
--- a/data/chips/STM32L052T8.json
+++ b/data/chips/STM32L052T8.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L053C6.json b/data/chips/STM32L053C6.json
index 7cb17fa..0352d3b 100644
--- a/data/chips/STM32L053C6.json
+++ b/data/chips/STM32L053C6.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L053C8.json b/data/chips/STM32L053C8.json
index b2b2b21..cb4247f 100644
--- a/data/chips/STM32L053C8.json
+++ b/data/chips/STM32L053C8.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L053R6.json b/data/chips/STM32L053R6.json
index 41fd392..54a3587 100644
--- a/data/chips/STM32L053R6.json
+++ b/data/chips/STM32L053R6.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -439,7 +439,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L053R8.json b/data/chips/STM32L053R8.json
index aa55dc3..b8ba7c6 100644
--- a/data/chips/STM32L053R8.json
+++ b/data/chips/STM32L053R8.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -439,7 +439,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L062C8.json b/data/chips/STM32L062C8.json
index cdad4cf..d0a1cd1 100644
--- a/data/chips/STM32L062C8.json
+++ b/data/chips/STM32L062C8.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L062K8.json b/data/chips/STM32L062K8.json
index 750295a..5e523cf 100644
--- a/data/chips/STM32L062K8.json
+++ b/data/chips/STM32L062K8.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L063C8.json b/data/chips/STM32L063C8.json
index c4e4b3e..7152250 100644
--- a/data/chips/STM32L063C8.json
+++ b/data/chips/STM32L063C8.json
@@ -334,7 +334,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L063R8.json b/data/chips/STM32L063R8.json
index 6171013..9b8d651 100644
--- a/data/chips/STM32L063R8.json
+++ b/data/chips/STM32L063R8.json
@@ -330,7 +330,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071C8.json b/data/chips/STM32L071C8.json
index b72992b..564351f 100644
--- a/data/chips/STM32L071C8.json
+++ b/data/chips/STM32L071C8.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071CB.json b/data/chips/STM32L071CB.json
index 8f00ccb..c7a5f55 100644
--- a/data/chips/STM32L071CB.json
+++ b/data/chips/STM32L071CB.json
@@ -326,7 +326,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071CZ.json b/data/chips/STM32L071CZ.json
index 2503228..87b7f84 100644
--- a/data/chips/STM32L071CZ.json
+++ b/data/chips/STM32L071CZ.json
@@ -326,7 +326,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071K8.json b/data/chips/STM32L071K8.json
index 57fa3ec..f546bc1 100644
--- a/data/chips/STM32L071K8.json
+++ b/data/chips/STM32L071K8.json
@@ -318,7 +318,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -399,7 +399,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071KB.json b/data/chips/STM32L071KB.json
index 6a01b90..1234ac8 100644
--- a/data/chips/STM32L071KB.json
+++ b/data/chips/STM32L071KB.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071KZ.json b/data/chips/STM32L071KZ.json
index d70d8fc..6b72a0e 100644
--- a/data/chips/STM32L071KZ.json
+++ b/data/chips/STM32L071KZ.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071RB.json b/data/chips/STM32L071RB.json
index c5aa465..5f43c2b 100644
--- a/data/chips/STM32L071RB.json
+++ b/data/chips/STM32L071RB.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071RZ.json b/data/chips/STM32L071RZ.json
index 4d5d983..5eebbf1 100644
--- a/data/chips/STM32L071RZ.json
+++ b/data/chips/STM32L071RZ.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071V8.json b/data/chips/STM32L071V8.json
index c65d854..9c6d350 100644
--- a/data/chips/STM32L071V8.json
+++ b/data/chips/STM32L071V8.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071VB.json b/data/chips/STM32L071VB.json
index 09c9406..8fd193d 100644
--- a/data/chips/STM32L071VB.json
+++ b/data/chips/STM32L071VB.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L071VZ.json b/data/chips/STM32L071VZ.json
index 7ada2e7..1cf0f82 100644
--- a/data/chips/STM32L071VZ.json
+++ b/data/chips/STM32L071VZ.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072CB.json b/data/chips/STM32L072CB.json
index 2cae5c5..fe669d3 100644
--- a/data/chips/STM32L072CB.json
+++ b/data/chips/STM32L072CB.json
@@ -332,7 +332,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -425,7 +425,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072CZ.json b/data/chips/STM32L072CZ.json
index 7c204fe..1d94984 100644
--- a/data/chips/STM32L072CZ.json
+++ b/data/chips/STM32L072CZ.json
@@ -336,7 +336,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -429,7 +429,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072KB.json b/data/chips/STM32L072KB.json
index cb5ac37..9461819 100644
--- a/data/chips/STM32L072KB.json
+++ b/data/chips/STM32L072KB.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072KZ.json b/data/chips/STM32L072KZ.json
index 785031e..22889b1 100644
--- a/data/chips/STM32L072KZ.json
+++ b/data/chips/STM32L072KZ.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072RB.json b/data/chips/STM32L072RB.json
index e9cbd6b..4f60dd5 100644
--- a/data/chips/STM32L072RB.json
+++ b/data/chips/STM32L072RB.json
@@ -332,7 +332,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -437,7 +437,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072RZ.json b/data/chips/STM32L072RZ.json
index 604fbf2..880f70d 100644
--- a/data/chips/STM32L072RZ.json
+++ b/data/chips/STM32L072RZ.json
@@ -332,7 +332,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -437,7 +437,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072V8.json b/data/chips/STM32L072V8.json
index 32e84a5..c330d6e 100644
--- a/data/chips/STM32L072V8.json
+++ b/data/chips/STM32L072V8.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072VB.json b/data/chips/STM32L072VB.json
index 9c541b1..6eeb5d4 100644
--- a/data/chips/STM32L072VB.json
+++ b/data/chips/STM32L072VB.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L072VZ.json b/data/chips/STM32L072VZ.json
index eafdee1..68fb29a 100644
--- a/data/chips/STM32L072VZ.json
+++ b/data/chips/STM32L072VZ.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L073CB.json b/data/chips/STM32L073CB.json
index e0aae88..3b83285 100644
--- a/data/chips/STM32L073CB.json
+++ b/data/chips/STM32L073CB.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -421,7 +421,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L073CZ.json b/data/chips/STM32L073CZ.json
index 3fcf6db..72dd8f0 100644
--- a/data/chips/STM32L073CZ.json
+++ b/data/chips/STM32L073CZ.json
@@ -332,7 +332,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -425,7 +425,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L073RB.json b/data/chips/STM32L073RB.json
index 0f9770c..24269de 100644
--- a/data/chips/STM32L073RB.json
+++ b/data/chips/STM32L073RB.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L073RZ.json b/data/chips/STM32L073RZ.json
index a061d00..5d8f70a 100644
--- a/data/chips/STM32L073RZ.json
+++ b/data/chips/STM32L073RZ.json
@@ -332,7 +332,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -437,7 +437,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L073V8.json b/data/chips/STM32L073V8.json
index b6da3db..38913bb 100644
--- a/data/chips/STM32L073V8.json
+++ b/data/chips/STM32L073V8.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L073VB.json b/data/chips/STM32L073VB.json
index 0ad05e7..9d725b8 100644
--- a/data/chips/STM32L073VB.json
+++ b/data/chips/STM32L073VB.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L073VZ.json b/data/chips/STM32L073VZ.json
index cbe6d1c..02e2537 100644
--- a/data/chips/STM32L073VZ.json
+++ b/data/chips/STM32L073VZ.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L081CB.json b/data/chips/STM32L081CB.json
index 4804135..87d60c1 100644
--- a/data/chips/STM32L081CB.json
+++ b/data/chips/STM32L081CB.json
@@ -312,7 +312,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -393,7 +393,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L081CZ.json b/data/chips/STM32L081CZ.json
index 617b602..df53829 100644
--- a/data/chips/STM32L081CZ.json
+++ b/data/chips/STM32L081CZ.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L081KZ.json b/data/chips/STM32L081KZ.json
index 094d805..9e2d40a 100644
--- a/data/chips/STM32L081KZ.json
+++ b/data/chips/STM32L081KZ.json
@@ -322,7 +322,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L082CZ.json b/data/chips/STM32L082CZ.json
index 48d5b9f..41fc93b 100644
--- a/data/chips/STM32L082CZ.json
+++ b/data/chips/STM32L082CZ.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -421,7 +421,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L082KB.json b/data/chips/STM32L082KB.json
index 98fe542..0becd8c 100644
--- a/data/chips/STM32L082KB.json
+++ b/data/chips/STM32L082KB.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L082KZ.json b/data/chips/STM32L082KZ.json
index eba75f5..9430bb8 100644
--- a/data/chips/STM32L082KZ.json
+++ b/data/chips/STM32L082KZ.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L083CB.json b/data/chips/STM32L083CB.json
index dffa9c0..d3c729a 100644
--- a/data/chips/STM32L083CB.json
+++ b/data/chips/STM32L083CB.json
@@ -324,7 +324,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -405,7 +405,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L083CZ.json b/data/chips/STM32L083CZ.json
index 3ae3d3f..e75d72c 100644
--- a/data/chips/STM32L083CZ.json
+++ b/data/chips/STM32L083CZ.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L083RB.json b/data/chips/STM32L083RB.json
index bca0dba..2f0c676 100644
--- a/data/chips/STM32L083RB.json
+++ b/data/chips/STM32L083RB.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L083RZ.json b/data/chips/STM32L083RZ.json
index 9083d13..3ebf92a 100644
--- a/data/chips/STM32L083RZ.json
+++ b/data/chips/STM32L083RZ.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L083V8.json b/data/chips/STM32L083V8.json
index 108fc9c..97dc8ee 100644
--- a/data/chips/STM32L083V8.json
+++ b/data/chips/STM32L083V8.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L083VB.json b/data/chips/STM32L083VB.json
index 20d5edb..9aabb17 100644
--- a/data/chips/STM32L083VB.json
+++ b/data/chips/STM32L083VB.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L083VZ.json b/data/chips/STM32L083VZ.json
index b0d2af7..de23595 100644
--- a/data/chips/STM32L083VZ.json
+++ b/data/chips/STM32L083VZ.json
@@ -328,7 +328,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352
                 },
                 {
diff --git a/data/chips/STM32L100C6-A.json b/data/chips/STM32L100C6-A.json
index 5db9797..dade753 100644
--- a/data/chips/STM32L100C6-A.json
+++ b/data/chips/STM32L100C6-A.json
@@ -294,7 +294,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -385,7 +385,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L100C6.json b/data/chips/STM32L100C6.json
index ab506ce..8ed8c63 100644
--- a/data/chips/STM32L100C6.json
+++ b/data/chips/STM32L100C6.json
@@ -294,7 +294,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -385,7 +385,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L100R8-A.json b/data/chips/STM32L100R8-A.json
index 1999400..ed314db 100644
--- a/data/chips/STM32L100R8-A.json
+++ b/data/chips/STM32L100R8-A.json
@@ -294,7 +294,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L100R8.json b/data/chips/STM32L100R8.json
index 0471fe0..1e49977 100644
--- a/data/chips/STM32L100R8.json
+++ b/data/chips/STM32L100R8.json
@@ -294,7 +294,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L100RB-A.json b/data/chips/STM32L100RB-A.json
index e9ba938..1fb249b 100644
--- a/data/chips/STM32L100RB-A.json
+++ b/data/chips/STM32L100RB-A.json
@@ -294,7 +294,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L100RB.json b/data/chips/STM32L100RB.json
index 33635c7..ab495e0 100644
--- a/data/chips/STM32L100RB.json
+++ b/data/chips/STM32L100RB.json
@@ -294,7 +294,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L100RC.json b/data/chips/STM32L100RC.json
index 51e4ea5..74186f8 100644
--- a/data/chips/STM32L100RC.json
+++ b/data/chips/STM32L100RC.json
@@ -300,7 +300,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151C6-A.json b/data/chips/STM32L151C6-A.json
index f31c9a1..7dea162 100644
--- a/data/chips/STM32L151C6-A.json
+++ b/data/chips/STM32L151C6-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151C6.json b/data/chips/STM32L151C6.json
index 6801f54..f100059 100644
--- a/data/chips/STM32L151C6.json
+++ b/data/chips/STM32L151C6.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151C8-A.json b/data/chips/STM32L151C8-A.json
index dd797bc..5002bf7 100644
--- a/data/chips/STM32L151C8-A.json
+++ b/data/chips/STM32L151C8-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151C8.json b/data/chips/STM32L151C8.json
index 546339b..63d9f8e 100644
--- a/data/chips/STM32L151C8.json
+++ b/data/chips/STM32L151C8.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151CB-A.json b/data/chips/STM32L151CB-A.json
index 332d979..3801817 100644
--- a/data/chips/STM32L151CB-A.json
+++ b/data/chips/STM32L151CB-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151CB.json b/data/chips/STM32L151CB.json
index a02607f..f012a9c 100644
--- a/data/chips/STM32L151CB.json
+++ b/data/chips/STM32L151CB.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151CC.json b/data/chips/STM32L151CC.json
index bb09ae1..cfba2f3 100644
--- a/data/chips/STM32L151CC.json
+++ b/data/chips/STM32L151CC.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151QC.json b/data/chips/STM32L151QC.json
index 2a25c51..083c848 100644
--- a/data/chips/STM32L151QC.json
+++ b/data/chips/STM32L151QC.json
@@ -317,7 +317,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -508,7 +508,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151QD.json b/data/chips/STM32L151QD.json
index bb4ea1c..b727600 100644
--- a/data/chips/STM32L151QD.json
+++ b/data/chips/STM32L151QD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -502,7 +502,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151QE.json b/data/chips/STM32L151QE.json
index ea9c491..850859b 100644
--- a/data/chips/STM32L151QE.json
+++ b/data/chips/STM32L151QE.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -496,7 +496,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151R6-A.json b/data/chips/STM32L151R6-A.json
index 7d84b0d..c196d74 100644
--- a/data/chips/STM32L151R6-A.json
+++ b/data/chips/STM32L151R6-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -413,7 +413,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151R6.json b/data/chips/STM32L151R6.json
index b07d1c2..0b1df25 100644
--- a/data/chips/STM32L151R6.json
+++ b/data/chips/STM32L151R6.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151R8-A.json b/data/chips/STM32L151R8-A.json
index d6336ed..f79445e 100644
--- a/data/chips/STM32L151R8-A.json
+++ b/data/chips/STM32L151R8-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -413,7 +413,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151R8.json b/data/chips/STM32L151R8.json
index 5028e6d..c4440d9 100644
--- a/data/chips/STM32L151R8.json
+++ b/data/chips/STM32L151R8.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151RB-A.json b/data/chips/STM32L151RB-A.json
index 919a752..f266c22 100644
--- a/data/chips/STM32L151RB-A.json
+++ b/data/chips/STM32L151RB-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -413,7 +413,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151RB.json b/data/chips/STM32L151RB.json
index 31c2590..419708e 100644
--- a/data/chips/STM32L151RB.json
+++ b/data/chips/STM32L151RB.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151RC-A.json b/data/chips/STM32L151RC-A.json
index 301686e..4de5d1b 100644
--- a/data/chips/STM32L151RC-A.json
+++ b/data/chips/STM32L151RC-A.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -420,7 +420,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151RC.json b/data/chips/STM32L151RC.json
index ddefd1f..857ef1f 100644
--- a/data/chips/STM32L151RC.json
+++ b/data/chips/STM32L151RC.json
@@ -310,7 +310,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -425,7 +425,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151RD.json b/data/chips/STM32L151RD.json
index b6a9334..baea415 100644
--- a/data/chips/STM32L151RD.json
+++ b/data/chips/STM32L151RD.json
@@ -315,7 +315,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -430,7 +430,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151RE.json b/data/chips/STM32L151RE.json
index eba7591..b5bd4a1 100644
--- a/data/chips/STM32L151RE.json
+++ b/data/chips/STM32L151RE.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -424,7 +424,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151UC.json b/data/chips/STM32L151UC.json
index 6452c18..fd05c16 100644
--- a/data/chips/STM32L151UC.json
+++ b/data/chips/STM32L151UC.json
@@ -300,7 +300,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151V8-A.json b/data/chips/STM32L151V8-A.json
index 29332cf..870dfa4 100644
--- a/data/chips/STM32L151V8-A.json
+++ b/data/chips/STM32L151V8-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -429,7 +429,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151V8.json b/data/chips/STM32L151V8.json
index 6f2c789..de7e150 100644
--- a/data/chips/STM32L151V8.json
+++ b/data/chips/STM32L151V8.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151VB-A.json b/data/chips/STM32L151VB-A.json
index 505f211..479e867 100644
--- a/data/chips/STM32L151VB-A.json
+++ b/data/chips/STM32L151VB-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -429,7 +429,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151VB.json b/data/chips/STM32L151VB.json
index e26c807..31fef94 100644
--- a/data/chips/STM32L151VB.json
+++ b/data/chips/STM32L151VB.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151VC-A.json b/data/chips/STM32L151VC-A.json
index 2757aed..cc02e29 100644
--- a/data/chips/STM32L151VC-A.json
+++ b/data/chips/STM32L151VC-A.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -436,7 +436,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151VC.json b/data/chips/STM32L151VC.json
index 5b0bfdd..ab34dfb 100644
--- a/data/chips/STM32L151VC.json
+++ b/data/chips/STM32L151VC.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151VD-X.json b/data/chips/STM32L151VD-X.json
index dadb8d4..f380109 100644
--- a/data/chips/STM32L151VD-X.json
+++ b/data/chips/STM32L151VD-X.json
@@ -309,7 +309,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -444,7 +444,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151VD.json b/data/chips/STM32L151VD.json
index 1c1e23c..ab089eb 100644
--- a/data/chips/STM32L151VD.json
+++ b/data/chips/STM32L151VD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -442,7 +442,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151VE.json b/data/chips/STM32L151VE.json
index 1bda77c..65737b6 100644
--- a/data/chips/STM32L151VE.json
+++ b/data/chips/STM32L151VE.json
@@ -309,7 +309,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -444,7 +444,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151ZC.json b/data/chips/STM32L151ZC.json
index 5978a44..41d757c 100644
--- a/data/chips/STM32L151ZC.json
+++ b/data/chips/STM32L151ZC.json
@@ -317,7 +317,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -512,7 +512,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151ZD.json b/data/chips/STM32L151ZD.json
index 8f7640f..802e41a 100644
--- a/data/chips/STM32L151ZD.json
+++ b/data/chips/STM32L151ZD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -506,7 +506,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L151ZE.json b/data/chips/STM32L151ZE.json
index 48b2cbb..42f3311 100644
--- a/data/chips/STM32L151ZE.json
+++ b/data/chips/STM32L151ZE.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -500,7 +500,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152C6-A.json b/data/chips/STM32L152C6-A.json
index 63042da..72fb010 100644
--- a/data/chips/STM32L152C6-A.json
+++ b/data/chips/STM32L152C6-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152C6.json b/data/chips/STM32L152C6.json
index b07a923..537011c 100644
--- a/data/chips/STM32L152C6.json
+++ b/data/chips/STM32L152C6.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152C8-A.json b/data/chips/STM32L152C8-A.json
index 82efa26..d5a706d 100644
--- a/data/chips/STM32L152C8-A.json
+++ b/data/chips/STM32L152C8-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152C8.json b/data/chips/STM32L152C8.json
index a8f52f7..87aea58 100644
--- a/data/chips/STM32L152C8.json
+++ b/data/chips/STM32L152C8.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152CB-A.json b/data/chips/STM32L152CB-A.json
index 38ea178..0eb5aee 100644
--- a/data/chips/STM32L152CB-A.json
+++ b/data/chips/STM32L152CB-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152CB.json b/data/chips/STM32L152CB.json
index cb118f4..ada5cb7 100644
--- a/data/chips/STM32L152CB.json
+++ b/data/chips/STM32L152CB.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152CC.json b/data/chips/STM32L152CC.json
index 01f906d..122d4d5 100644
--- a/data/chips/STM32L152CC.json
+++ b/data/chips/STM32L152CC.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152QC.json b/data/chips/STM32L152QC.json
index c256013..b087374 100644
--- a/data/chips/STM32L152QC.json
+++ b/data/chips/STM32L152QC.json
@@ -317,7 +317,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -508,7 +508,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152QD.json b/data/chips/STM32L152QD.json
index 11d6c25..f91b56c 100644
--- a/data/chips/STM32L152QD.json
+++ b/data/chips/STM32L152QD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -502,7 +502,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152QE.json b/data/chips/STM32L152QE.json
index 73f8753..e4ff2c0 100644
--- a/data/chips/STM32L152QE.json
+++ b/data/chips/STM32L152QE.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -496,7 +496,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152R6-A.json b/data/chips/STM32L152R6-A.json
index f3430f7..5201e85 100644
--- a/data/chips/STM32L152R6-A.json
+++ b/data/chips/STM32L152R6-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -413,7 +413,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152R6.json b/data/chips/STM32L152R6.json
index b5bdf72..48ee3f9 100644
--- a/data/chips/STM32L152R6.json
+++ b/data/chips/STM32L152R6.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152R8-A.json b/data/chips/STM32L152R8-A.json
index e5d25a7..bf9e51d 100644
--- a/data/chips/STM32L152R8-A.json
+++ b/data/chips/STM32L152R8-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -413,7 +413,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152R8.json b/data/chips/STM32L152R8.json
index 0e4a072..7e82e50 100644
--- a/data/chips/STM32L152R8.json
+++ b/data/chips/STM32L152R8.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152RB-A.json b/data/chips/STM32L152RB-A.json
index 4eb25c1..82e4a8b 100644
--- a/data/chips/STM32L152RB-A.json
+++ b/data/chips/STM32L152RB-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -413,7 +413,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152RB.json b/data/chips/STM32L152RB.json
index d16fe7d..42f2dbb 100644
--- a/data/chips/STM32L152RB.json
+++ b/data/chips/STM32L152RB.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152RC-A.json b/data/chips/STM32L152RC-A.json
index 144f5fa..0c9543a 100644
--- a/data/chips/STM32L152RC-A.json
+++ b/data/chips/STM32L152RC-A.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -420,7 +420,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152RC.json b/data/chips/STM32L152RC.json
index b35eb69..0d0b931 100644
--- a/data/chips/STM32L152RC.json
+++ b/data/chips/STM32L152RC.json
@@ -306,7 +306,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -421,7 +421,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152RD.json b/data/chips/STM32L152RD.json
index c7f6d7e..c35762c 100644
--- a/data/chips/STM32L152RD.json
+++ b/data/chips/STM32L152RD.json
@@ -315,7 +315,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -430,7 +430,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152RE.json b/data/chips/STM32L152RE.json
index d1cd399..bab1152 100644
--- a/data/chips/STM32L152RE.json
+++ b/data/chips/STM32L152RE.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -424,7 +424,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152UC.json b/data/chips/STM32L152UC.json
index 34fa267..58bed7a 100644
--- a/data/chips/STM32L152UC.json
+++ b/data/chips/STM32L152UC.json
@@ -300,7 +300,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152V8-A.json b/data/chips/STM32L152V8-A.json
index dd51100..24ae5d2 100644
--- a/data/chips/STM32L152V8-A.json
+++ b/data/chips/STM32L152V8-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -429,7 +429,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152V8.json b/data/chips/STM32L152V8.json
index 5104a9e..f3e856d 100644
--- a/data/chips/STM32L152V8.json
+++ b/data/chips/STM32L152V8.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152VB-A.json b/data/chips/STM32L152VB-A.json
index d359ba9..affcf5b 100644
--- a/data/chips/STM32L152VB-A.json
+++ b/data/chips/STM32L152VB-A.json
@@ -298,7 +298,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -429,7 +429,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152VB.json b/data/chips/STM32L152VB.json
index b04497e..a2ce9c3 100644
--- a/data/chips/STM32L152VB.json
+++ b/data/chips/STM32L152VB.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152VC-A.json b/data/chips/STM32L152VC-A.json
index df82883..5ea3a42 100644
--- a/data/chips/STM32L152VC-A.json
+++ b/data/chips/STM32L152VC-A.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -436,7 +436,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152VC.json b/data/chips/STM32L152VC.json
index 58370ef..e3eb1ab 100644
--- a/data/chips/STM32L152VC.json
+++ b/data/chips/STM32L152VC.json
@@ -310,7 +310,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152VD-X.json b/data/chips/STM32L152VD-X.json
index a82de2c..6d11ba6 100644
--- a/data/chips/STM32L152VD-X.json
+++ b/data/chips/STM32L152VD-X.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -440,7 +440,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152VD.json b/data/chips/STM32L152VD.json
index 9471b69..693b59c 100644
--- a/data/chips/STM32L152VD.json
+++ b/data/chips/STM32L152VD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -442,7 +442,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152VE.json b/data/chips/STM32L152VE.json
index 3073a15..c3d281a 100644
--- a/data/chips/STM32L152VE.json
+++ b/data/chips/STM32L152VE.json
@@ -309,7 +309,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -444,7 +444,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152ZC.json b/data/chips/STM32L152ZC.json
index c2d6da6..49cb3f6 100644
--- a/data/chips/STM32L152ZC.json
+++ b/data/chips/STM32L152ZC.json
@@ -317,7 +317,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -512,7 +512,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152ZD.json b/data/chips/STM32L152ZD.json
index 9365d50..83a878e 100644
--- a/data/chips/STM32L152ZD.json
+++ b/data/chips/STM32L152ZD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -506,7 +506,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L152ZE.json b/data/chips/STM32L152ZE.json
index 7f22509..f1f8f32 100644
--- a/data/chips/STM32L152ZE.json
+++ b/data/chips/STM32L152ZE.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -500,7 +500,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162QC.json b/data/chips/STM32L162QC.json
index b9c689f..a68e911 100644
--- a/data/chips/STM32L162QC.json
+++ b/data/chips/STM32L162QC.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -502,7 +502,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162QD.json b/data/chips/STM32L162QD.json
index 6776fda..e8efb91 100644
--- a/data/chips/STM32L162QD.json
+++ b/data/chips/STM32L162QD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -502,7 +502,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162RC-A.json b/data/chips/STM32L162RC-A.json
index 6c656d8..2a81afd 100644
--- a/data/chips/STM32L162RC-A.json
+++ b/data/chips/STM32L162RC-A.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -420,7 +420,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162RC.json b/data/chips/STM32L162RC.json
index 094bfca..a990921 100644
--- a/data/chips/STM32L162RC.json
+++ b/data/chips/STM32L162RC.json
@@ -300,7 +300,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162RD.json b/data/chips/STM32L162RD.json
index 4515562..7391c20 100644
--- a/data/chips/STM32L162RD.json
+++ b/data/chips/STM32L162RD.json
@@ -309,7 +309,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -424,7 +424,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162RE.json b/data/chips/STM32L162RE.json
index 640a7e2..96c6f37 100644
--- a/data/chips/STM32L162RE.json
+++ b/data/chips/STM32L162RE.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -424,7 +424,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162VC-A.json b/data/chips/STM32L162VC-A.json
index 0e9b262..d954f0b 100644
--- a/data/chips/STM32L162VC-A.json
+++ b/data/chips/STM32L162VC-A.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -436,7 +436,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162VC.json b/data/chips/STM32L162VC.json
index 44381c7..2433cc9 100644
--- a/data/chips/STM32L162VC.json
+++ b/data/chips/STM32L162VC.json
@@ -304,7 +304,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162VD-X.json b/data/chips/STM32L162VD-X.json
index 77b3c73..1527eec 100644
--- a/data/chips/STM32L162VD-X.json
+++ b/data/chips/STM32L162VD-X.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -440,7 +440,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162VD.json b/data/chips/STM32L162VD.json
index a3952a8..735321f 100644
--- a/data/chips/STM32L162VD.json
+++ b/data/chips/STM32L162VD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -442,7 +442,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162VE.json b/data/chips/STM32L162VE.json
index 99f13a9..97ca5c0 100644
--- a/data/chips/STM32L162VE.json
+++ b/data/chips/STM32L162VE.json
@@ -309,7 +309,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -444,7 +444,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162ZC.json b/data/chips/STM32L162ZC.json
index 93ec8a4..84a8261 100644
--- a/data/chips/STM32L162ZC.json
+++ b/data/chips/STM32L162ZC.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -506,7 +506,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162ZD.json b/data/chips/STM32L162ZD.json
index 25c0ba8..d890944 100644
--- a/data/chips/STM32L162ZD.json
+++ b/data/chips/STM32L162ZD.json
@@ -311,7 +311,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -506,7 +506,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L162ZE.json b/data/chips/STM32L162ZE.json
index 36eca99..1a21af6 100644
--- a/data/chips/STM32L162ZE.json
+++ b/data/chips/STM32L162ZE.json
@@ -305,7 +305,7 @@
             "name": "cm3",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -500,7 +500,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817344
                 },
                 {
diff --git a/data/chips/STM32L412C8.json b/data/chips/STM32L412C8.json
index c62c63a..5598908 100644
--- a/data/chips/STM32L412C8.json
+++ b/data/chips/STM32L412C8.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -547,15 +556,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L412CB.json b/data/chips/STM32L412CB.json
index b719b10..acaeca8 100644
--- a/data/chips/STM32L412CB.json
+++ b/data/chips/STM32L412CB.json
@@ -479,6 +479,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -555,15 +564,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L412K8.json b/data/chips/STM32L412K8.json
index 11d97fc..5b21d41 100644
--- a/data/chips/STM32L412K8.json
+++ b/data/chips/STM32L412K8.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -547,15 +556,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L412KB.json b/data/chips/STM32L412KB.json
index f832a3f..0051ef5 100644
--- a/data/chips/STM32L412KB.json
+++ b/data/chips/STM32L412KB.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -547,15 +556,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L412R8.json b/data/chips/STM32L412R8.json
index eda397b..90fedbe 100644
--- a/data/chips/STM32L412R8.json
+++ b/data/chips/STM32L412R8.json
@@ -495,6 +495,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -595,15 +604,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L412RB.json b/data/chips/STM32L412RB.json
index dee7772..1aa9d1e 100644
--- a/data/chips/STM32L412RB.json
+++ b/data/chips/STM32L412RB.json
@@ -509,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -609,15 +618,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L412T8.json b/data/chips/STM32L412T8.json
index d2bec19..286a032 100644
--- a/data/chips/STM32L412T8.json
+++ b/data/chips/STM32L412T8.json
@@ -467,6 +467,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -543,15 +552,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L412TB.json b/data/chips/STM32L412TB.json
index 05fea31..36f9c11 100644
--- a/data/chips/STM32L412TB.json
+++ b/data/chips/STM32L412TB.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -547,15 +556,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L422CB.json b/data/chips/STM32L422CB.json
index c855451..30fca30 100644
--- a/data/chips/STM32L422CB.json
+++ b/data/chips/STM32L422CB.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -547,15 +556,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L422KB.json b/data/chips/STM32L422KB.json
index 8e9d63e..b36ad33 100644
--- a/data/chips/STM32L422KB.json
+++ b/data/chips/STM32L422KB.json
@@ -471,6 +471,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -547,15 +556,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L422RB.json b/data/chips/STM32L422RB.json
index 9fbad9c..4e0be22 100644
--- a/data/chips/STM32L422RB.json
+++ b/data/chips/STM32L422RB.json
@@ -501,6 +501,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -601,15 +610,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L422TB.json b/data/chips/STM32L422TB.json
index e008849..835ec9b 100644
--- a/data/chips/STM32L422TB.json
+++ b/data/chips/STM32L422TB.json
@@ -467,6 +467,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -543,15 +552,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L431CB.json b/data/chips/STM32L431CB.json
index 453299e..4d7bb73 100644
--- a/data/chips/STM32L431CB.json
+++ b/data/chips/STM32L431CB.json
@@ -474,7 +474,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L431CC.json b/data/chips/STM32L431CC.json
index 366629a..19ad33a 100644
--- a/data/chips/STM32L431CC.json
+++ b/data/chips/STM32L431CC.json
@@ -474,7 +474,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L431KB.json b/data/chips/STM32L431KB.json
index 8d50b3e..617c66f 100644
--- a/data/chips/STM32L431KB.json
+++ b/data/chips/STM32L431KB.json
@@ -462,7 +462,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L431KC.json b/data/chips/STM32L431KC.json
index f19ec82..92611c0 100644
--- a/data/chips/STM32L431KC.json
+++ b/data/chips/STM32L431KC.json
@@ -462,7 +462,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L431RB.json b/data/chips/STM32L431RB.json
index 7f7d5f0..c962f67 100644
--- a/data/chips/STM32L431RB.json
+++ b/data/chips/STM32L431RB.json
@@ -494,7 +494,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L431RC.json b/data/chips/STM32L431RC.json
index 92f0d86..0afb1bc 100644
--- a/data/chips/STM32L431RC.json
+++ b/data/chips/STM32L431RC.json
@@ -494,7 +494,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L431VC.json b/data/chips/STM32L431VC.json
index a7caf6b..211c28b 100644
--- a/data/chips/STM32L431VC.json
+++ b/data/chips/STM32L431VC.json
@@ -490,7 +490,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L432KB.json b/data/chips/STM32L432KB.json
index 48e4764..53831e9 100644
--- a/data/chips/STM32L432KB.json
+++ b/data/chips/STM32L432KB.json
@@ -468,7 +468,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L432KC.json b/data/chips/STM32L432KC.json
index 5833461..8205539 100644
--- a/data/chips/STM32L432KC.json
+++ b/data/chips/STM32L432KC.json
@@ -468,7 +468,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L433CB.json b/data/chips/STM32L433CB.json
index fb691e5..2a8e055 100644
--- a/data/chips/STM32L433CB.json
+++ b/data/chips/STM32L433CB.json
@@ -486,7 +486,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L433CC.json b/data/chips/STM32L433CC.json
index a030539..b71c2d7 100644
--- a/data/chips/STM32L433CC.json
+++ b/data/chips/STM32L433CC.json
@@ -486,7 +486,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L433RB.json b/data/chips/STM32L433RB.json
index e5781e6..e82a8d9 100644
--- a/data/chips/STM32L433RB.json
+++ b/data/chips/STM32L433RB.json
@@ -506,7 +506,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L433RC.json b/data/chips/STM32L433RC.json
index 8fdcc29..3850940 100644
--- a/data/chips/STM32L433RC.json
+++ b/data/chips/STM32L433RC.json
@@ -516,7 +516,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L433VC.json b/data/chips/STM32L433VC.json
index 78ad857..2c92acc 100644
--- a/data/chips/STM32L433VC.json
+++ b/data/chips/STM32L433VC.json
@@ -502,7 +502,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L442KC.json b/data/chips/STM32L442KC.json
index 7673cc0..989bf9f 100644
--- a/data/chips/STM32L442KC.json
+++ b/data/chips/STM32L442KC.json
@@ -468,7 +468,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L443CC.json b/data/chips/STM32L443CC.json
index 3b83e9a..00208e3 100644
--- a/data/chips/STM32L443CC.json
+++ b/data/chips/STM32L443CC.json
@@ -490,7 +490,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L443RC.json b/data/chips/STM32L443RC.json
index 6ffd0b7..99c2176 100644
--- a/data/chips/STM32L443RC.json
+++ b/data/chips/STM32L443RC.json
@@ -506,7 +506,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L443VC.json b/data/chips/STM32L443VC.json
index e8e93fb..5adcf67 100644
--- a/data/chips/STM32L443VC.json
+++ b/data/chips/STM32L443VC.json
@@ -502,7 +502,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L451CC.json b/data/chips/STM32L451CC.json
index 71823de..5366e87 100644
--- a/data/chips/STM32L451CC.json
+++ b/data/chips/STM32L451CC.json
@@ -462,7 +462,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L451CE.json b/data/chips/STM32L451CE.json
index a1e579a..82cd6a0 100644
--- a/data/chips/STM32L451CE.json
+++ b/data/chips/STM32L451CE.json
@@ -466,7 +466,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L451RC.json b/data/chips/STM32L451RC.json
index 9264731..985838e 100644
--- a/data/chips/STM32L451RC.json
+++ b/data/chips/STM32L451RC.json
@@ -494,7 +494,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L451RE.json b/data/chips/STM32L451RE.json
index 1fb4b94..d77a4fa 100644
--- a/data/chips/STM32L451RE.json
+++ b/data/chips/STM32L451RE.json
@@ -494,7 +494,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L451VC.json b/data/chips/STM32L451VC.json
index df85560..bb2826c 100644
--- a/data/chips/STM32L451VC.json
+++ b/data/chips/STM32L451VC.json
@@ -490,7 +490,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L451VE.json b/data/chips/STM32L451VE.json
index f279e06..b56a54f 100644
--- a/data/chips/STM32L451VE.json
+++ b/data/chips/STM32L451VE.json
@@ -490,7 +490,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L452CC.json b/data/chips/STM32L452CC.json
index a475411..c5f327a 100644
--- a/data/chips/STM32L452CC.json
+++ b/data/chips/STM32L452CC.json
@@ -468,7 +468,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L452CE.json b/data/chips/STM32L452CE.json
index 71fc586..5b890ff 100644
--- a/data/chips/STM32L452CE.json
+++ b/data/chips/STM32L452CE.json
@@ -476,7 +476,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L452RC.json b/data/chips/STM32L452RC.json
index 7bad44c..6aab568 100644
--- a/data/chips/STM32L452RC.json
+++ b/data/chips/STM32L452RC.json
@@ -500,7 +500,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L452RE.json b/data/chips/STM32L452RE.json
index aecfcb1..b463b4f 100644
--- a/data/chips/STM32L452RE.json
+++ b/data/chips/STM32L452RE.json
@@ -514,7 +514,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L452VC.json b/data/chips/STM32L452VC.json
index 97f55c5..554fe6d 100644
--- a/data/chips/STM32L452VC.json
+++ b/data/chips/STM32L452VC.json
@@ -496,7 +496,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L452VE.json b/data/chips/STM32L452VE.json
index 81adf1f..f963e03 100644
--- a/data/chips/STM32L452VE.json
+++ b/data/chips/STM32L452VE.json
@@ -496,7 +496,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L462CE.json b/data/chips/STM32L462CE.json
index cfc3298..c69872f 100644
--- a/data/chips/STM32L462CE.json
+++ b/data/chips/STM32L462CE.json
@@ -478,7 +478,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L462RE.json b/data/chips/STM32L462RE.json
index d93f443..8535572 100644
--- a/data/chips/STM32L462RE.json
+++ b/data/chips/STM32L462RE.json
@@ -500,7 +500,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L462VE.json b/data/chips/STM32L462VE.json
index 4a54b4b..1b6063a 100644
--- a/data/chips/STM32L462VE.json
+++ b/data/chips/STM32L462VE.json
@@ -496,7 +496,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L471QE.json b/data/chips/STM32L471QE.json
index eed7406..a995a96 100644
--- a/data/chips/STM32L471QE.json
+++ b/data/chips/STM32L471QE.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -665,15 +674,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L471QG.json b/data/chips/STM32L471QG.json
index 1bea483..8124781 100644
--- a/data/chips/STM32L471QG.json
+++ b/data/chips/STM32L471QG.json
@@ -496,6 +496,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -676,15 +685,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L471RE.json b/data/chips/STM32L471RE.json
index 0f21d87..2a86133 100644
--- a/data/chips/STM32L471RE.json
+++ b/data/chips/STM32L471RE.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -653,15 +662,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L471RG.json b/data/chips/STM32L471RG.json
index 1df0273..4d64fae 100644
--- a/data/chips/STM32L471RG.json
+++ b/data/chips/STM32L471RG.json
@@ -496,6 +496,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -664,15 +673,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L471VE.json b/data/chips/STM32L471VE.json
index 10c52bc..0bc4f17 100644
--- a/data/chips/STM32L471VE.json
+++ b/data/chips/STM32L471VE.json
@@ -485,6 +485,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -653,15 +662,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L471VG.json b/data/chips/STM32L471VG.json
index afe35f9..a08f400 100644
--- a/data/chips/STM32L471VG.json
+++ b/data/chips/STM32L471VG.json
@@ -496,6 +496,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -664,15 +673,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L471ZE.json b/data/chips/STM32L471ZE.json
index fd7e961..dca6d8d 100644
--- a/data/chips/STM32L471ZE.json
+++ b/data/chips/STM32L471ZE.json
@@ -489,6 +489,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -689,15 +698,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L471ZG.json b/data/chips/STM32L471ZG.json
index fcfa584..48c2fd9 100644
--- a/data/chips/STM32L471ZG.json
+++ b/data/chips/STM32L471ZG.json
@@ -500,6 +500,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -700,15 +709,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L475RC.json b/data/chips/STM32L475RC.json
index ab064c2..84c4304 100644
--- a/data/chips/STM32L475RC.json
+++ b/data/chips/STM32L475RC.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -659,15 +668,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L475RE.json b/data/chips/STM32L475RE.json
index fb9ccad..d8aff59 100644
--- a/data/chips/STM32L475RE.json
+++ b/data/chips/STM32L475RE.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -659,15 +668,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L475RG.json b/data/chips/STM32L475RG.json
index f014d68..b76f496 100644
--- a/data/chips/STM32L475RG.json
+++ b/data/chips/STM32L475RG.json
@@ -502,6 +502,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -670,15 +679,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L475VC.json b/data/chips/STM32L475VC.json
index fc7e52f..b3af5c7 100644
--- a/data/chips/STM32L475VC.json
+++ b/data/chips/STM32L475VC.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -659,15 +668,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L475VE.json b/data/chips/STM32L475VE.json
index 12f315b..a58f702 100644
--- a/data/chips/STM32L475VE.json
+++ b/data/chips/STM32L475VE.json
@@ -491,6 +491,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -659,15 +668,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L475VG.json b/data/chips/STM32L475VG.json
index eaa5f87..e202359 100644
--- a/data/chips/STM32L475VG.json
+++ b/data/chips/STM32L475VG.json
@@ -502,6 +502,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -670,15 +679,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476JE.json b/data/chips/STM32L476JE.json
index 45fd67e..11e414e 100644
--- a/data/chips/STM32L476JE.json
+++ b/data/chips/STM32L476JE.json
@@ -515,6 +515,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -683,15 +692,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476JG.json b/data/chips/STM32L476JG.json
index 1371f83..32d98fb 100644
--- a/data/chips/STM32L476JG.json
+++ b/data/chips/STM32L476JG.json
@@ -536,6 +536,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -704,15 +713,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476ME.json b/data/chips/STM32L476ME.json
index 252981a..06ddf1e 100644
--- a/data/chips/STM32L476ME.json
+++ b/data/chips/STM32L476ME.json
@@ -515,6 +515,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -683,15 +692,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476MG.json b/data/chips/STM32L476MG.json
index cb59592..df6fcce 100644
--- a/data/chips/STM32L476MG.json
+++ b/data/chips/STM32L476MG.json
@@ -526,6 +526,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -694,15 +703,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476QE.json b/data/chips/STM32L476QE.json
index 67b3e74..ff13cfc 100644
--- a/data/chips/STM32L476QE.json
+++ b/data/chips/STM32L476QE.json
@@ -521,6 +521,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -701,15 +710,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476QG.json b/data/chips/STM32L476QG.json
index 1433f70..101adb9 100644
--- a/data/chips/STM32L476QG.json
+++ b/data/chips/STM32L476QG.json
@@ -536,6 +536,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -716,15 +725,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476RC.json b/data/chips/STM32L476RC.json
index 97964e0..9d90cd8 100644
--- a/data/chips/STM32L476RC.json
+++ b/data/chips/STM32L476RC.json
@@ -515,6 +515,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -683,15 +692,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476RE.json b/data/chips/STM32L476RE.json
index 2fae658..3be19b3 100644
--- a/data/chips/STM32L476RE.json
+++ b/data/chips/STM32L476RE.json
@@ -515,6 +515,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -683,15 +692,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476RG.json b/data/chips/STM32L476RG.json
index d20ac7c..50113ce 100644
--- a/data/chips/STM32L476RG.json
+++ b/data/chips/STM32L476RG.json
@@ -526,6 +526,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -694,15 +703,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476VC.json b/data/chips/STM32L476VC.json
index 55575a1..b31ad0c 100644
--- a/data/chips/STM32L476VC.json
+++ b/data/chips/STM32L476VC.json
@@ -521,6 +521,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -689,15 +698,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476VE.json b/data/chips/STM32L476VE.json
index 7a84331..6828ad3 100644
--- a/data/chips/STM32L476VE.json
+++ b/data/chips/STM32L476VE.json
@@ -521,6 +521,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -689,15 +698,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476VG.json b/data/chips/STM32L476VG.json
index 915fc97..8800e4c 100644
--- a/data/chips/STM32L476VG.json
+++ b/data/chips/STM32L476VG.json
@@ -536,6 +536,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -704,15 +713,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476ZE.json b/data/chips/STM32L476ZE.json
index 2df48cc..3543e08 100644
--- a/data/chips/STM32L476ZE.json
+++ b/data/chips/STM32L476ZE.json
@@ -521,6 +521,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -721,15 +730,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L476ZG.json b/data/chips/STM32L476ZG.json
index 72212f4..df7d5ec 100644
--- a/data/chips/STM32L476ZG.json
+++ b/data/chips/STM32L476ZG.json
@@ -546,6 +546,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -746,15 +755,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L486JG.json b/data/chips/STM32L486JG.json
index aeaee72..14eeb53 100644
--- a/data/chips/STM32L486JG.json
+++ b/data/chips/STM32L486JG.json
@@ -526,6 +526,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -694,15 +703,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L486QG.json b/data/chips/STM32L486QG.json
index da854a3..f402d95 100644
--- a/data/chips/STM32L486QG.json
+++ b/data/chips/STM32L486QG.json
@@ -532,6 +532,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -712,15 +721,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L486RG.json b/data/chips/STM32L486RG.json
index c77c82f..a2a3be4 100644
--- a/data/chips/STM32L486RG.json
+++ b/data/chips/STM32L486RG.json
@@ -526,6 +526,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -694,15 +703,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L486VG.json b/data/chips/STM32L486VG.json
index ada9683..a23e5c8 100644
--- a/data/chips/STM32L486VG.json
+++ b/data/chips/STM32L486VG.json
@@ -532,6 +532,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -700,15 +709,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L486ZG.json b/data/chips/STM32L486ZG.json
index 8c55966..9bcc0ed 100644
--- a/data/chips/STM32L486ZG.json
+++ b/data/chips/STM32L486ZG.json
@@ -532,6 +532,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -732,15 +741,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L496AE.json b/data/chips/STM32L496AE.json
index 9101917..5f16af6 100644
--- a/data/chips/STM32L496AE.json
+++ b/data/chips/STM32L496AE.json
@@ -509,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -693,15 +702,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496AG.json b/data/chips/STM32L496AG.json
index 64531b6..0a3cf80 100644
--- a/data/chips/STM32L496AG.json
+++ b/data/chips/STM32L496AG.json
@@ -530,6 +530,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -714,15 +723,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496QE.json b/data/chips/STM32L496QE.json
index 04938c7..a330fd7 100644
--- a/data/chips/STM32L496QE.json
+++ b/data/chips/STM32L496QE.json
@@ -509,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -689,15 +698,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496QG.json b/data/chips/STM32L496QG.json
index 2c3d262..f6d49dc 100644
--- a/data/chips/STM32L496QG.json
+++ b/data/chips/STM32L496QG.json
@@ -528,6 +528,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -708,15 +717,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496RE.json b/data/chips/STM32L496RE.json
index 75af341..97a596c 100644
--- a/data/chips/STM32L496RE.json
+++ b/data/chips/STM32L496RE.json
@@ -509,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -677,15 +686,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496RG.json b/data/chips/STM32L496RG.json
index 8d30103..c00b0cd 100644
--- a/data/chips/STM32L496RG.json
+++ b/data/chips/STM32L496RG.json
@@ -524,6 +524,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -692,15 +701,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496VE.json b/data/chips/STM32L496VE.json
index e6fd36a..0fc956a 100644
--- a/data/chips/STM32L496VE.json
+++ b/data/chips/STM32L496VE.json
@@ -509,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -677,15 +686,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496VG.json b/data/chips/STM32L496VG.json
index 35514e9..30da44b 100644
--- a/data/chips/STM32L496VG.json
+++ b/data/chips/STM32L496VG.json
@@ -538,6 +538,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -706,15 +715,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496WG.json b/data/chips/STM32L496WG.json
index 00258a5..371f609 100644
--- a/data/chips/STM32L496WG.json
+++ b/data/chips/STM32L496WG.json
@@ -772,6 +772,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -940,15 +949,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496ZE.json b/data/chips/STM32L496ZE.json
index 99397fe..342cbfa 100644
--- a/data/chips/STM32L496ZE.json
+++ b/data/chips/STM32L496ZE.json
@@ -509,6 +509,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -709,15 +718,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L496ZG.json b/data/chips/STM32L496ZG.json
index ed3ff62..fa7a945 100644
--- a/data/chips/STM32L496ZG.json
+++ b/data/chips/STM32L496ZG.json
@@ -530,6 +530,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -730,15 +739,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4A6AG.json b/data/chips/STM32L4A6AG.json
index d84cbf0..c2ed914 100644
--- a/data/chips/STM32L4A6AG.json
+++ b/data/chips/STM32L4A6AG.json
@@ -524,6 +524,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -708,15 +717,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4A6QG.json b/data/chips/STM32L4A6QG.json
index fcb9ad9..4e0c991 100644
--- a/data/chips/STM32L4A6QG.json
+++ b/data/chips/STM32L4A6QG.json
@@ -524,6 +524,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -704,15 +713,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4A6RG.json b/data/chips/STM32L4A6RG.json
index 1e75185..2908821 100644
--- a/data/chips/STM32L4A6RG.json
+++ b/data/chips/STM32L4A6RG.json
@@ -524,6 +524,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -692,15 +701,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4A6VG.json b/data/chips/STM32L4A6VG.json
index ee1ccd1..f21f7e0 100644
--- a/data/chips/STM32L4A6VG.json
+++ b/data/chips/STM32L4A6VG.json
@@ -532,6 +532,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -700,15 +709,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4A6ZG.json b/data/chips/STM32L4A6ZG.json
index 77ee1e8..c597f5c 100644
--- a/data/chips/STM32L4A6ZG.json
+++ b/data/chips/STM32L4A6ZG.json
@@ -524,6 +524,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC123_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -724,15 +733,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4P5AE.json b/data/chips/STM32L4P5AE.json
index 199d8a7..7138119 100644
--- a/data/chips/STM32L4P5AE.json
+++ b/data/chips/STM32L4P5AE.json
@@ -516,6 +516,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -619,15 +628,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5AG.json b/data/chips/STM32L4P5AG.json
index 1db9945..b160680 100644
--- a/data/chips/STM32L4P5AG.json
+++ b/data/chips/STM32L4P5AG.json
@@ -520,6 +520,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -623,15 +632,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5CE.json b/data/chips/STM32L4P5CE.json
index 03ef4b0..21d02d9 100644
--- a/data/chips/STM32L4P5CE.json
+++ b/data/chips/STM32L4P5CE.json
@@ -496,6 +496,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -575,15 +584,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5CG.json b/data/chips/STM32L4P5CG.json
index 1765a85..3cc1e20 100644
--- a/data/chips/STM32L4P5CG.json
+++ b/data/chips/STM32L4P5CG.json
@@ -504,6 +504,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -583,15 +592,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5QE.json b/data/chips/STM32L4P5QE.json
index cb53767..61faaa4 100644
--- a/data/chips/STM32L4P5QE.json
+++ b/data/chips/STM32L4P5QE.json
@@ -516,6 +516,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -619,15 +628,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5QG.json b/data/chips/STM32L4P5QG.json
index 1707cc6..290fc3f 100644
--- a/data/chips/STM32L4P5QG.json
+++ b/data/chips/STM32L4P5QG.json
@@ -524,6 +524,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -627,15 +636,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5RE.json b/data/chips/STM32L4P5RE.json
index c8ee40a..118b2a8 100644
--- a/data/chips/STM32L4P5RE.json
+++ b/data/chips/STM32L4P5RE.json
@@ -516,6 +516,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -619,15 +628,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5RG.json b/data/chips/STM32L4P5RG.json
index 025a626..7522b3b 100644
--- a/data/chips/STM32L4P5RG.json
+++ b/data/chips/STM32L4P5RG.json
@@ -520,6 +520,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -623,15 +632,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5VE.json b/data/chips/STM32L4P5VE.json
index a30e426..4ec9f66 100644
--- a/data/chips/STM32L4P5VE.json
+++ b/data/chips/STM32L4P5VE.json
@@ -520,6 +520,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -623,15 +632,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5VG.json b/data/chips/STM32L4P5VG.json
index 60a0e05..c1bce5c 100644
--- a/data/chips/STM32L4P5VG.json
+++ b/data/chips/STM32L4P5VG.json
@@ -528,6 +528,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -631,15 +640,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5ZE.json b/data/chips/STM32L4P5ZE.json
index 28f968f..41b87db 100644
--- a/data/chips/STM32L4P5ZE.json
+++ b/data/chips/STM32L4P5ZE.json
@@ -516,6 +516,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -619,15 +628,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4P5ZG.json b/data/chips/STM32L4P5ZG.json
index c3bf04c..deee6c5 100644
--- a/data/chips/STM32L4P5ZG.json
+++ b/data/chips/STM32L4P5ZG.json
@@ -520,6 +520,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -623,15 +632,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "CAN1",
                     "address": 1073767424,
diff --git a/data/chips/STM32L4Q5AG.json b/data/chips/STM32L4Q5AG.json
index 8d4afa8..3df0180 100644
--- a/data/chips/STM32L4Q5AG.json
+++ b/data/chips/STM32L4Q5AG.json
@@ -520,6 +520,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -623,15 +632,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4Q5CG.json b/data/chips/STM32L4Q5CG.json
index 6d2ff1e..072c8f6 100644
--- a/data/chips/STM32L4Q5CG.json
+++ b/data/chips/STM32L4Q5CG.json
@@ -504,6 +504,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -583,15 +592,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4Q5QG.json b/data/chips/STM32L4Q5QG.json
index 76c3407..1d67f28 100644
--- a/data/chips/STM32L4Q5QG.json
+++ b/data/chips/STM32L4Q5QG.json
@@ -520,6 +520,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -623,15 +632,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4Q5RG.json b/data/chips/STM32L4Q5RG.json
index 1e6a375..4293800 100644
--- a/data/chips/STM32L4Q5RG.json
+++ b/data/chips/STM32L4Q5RG.json
@@ -520,6 +520,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -623,15 +632,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4Q5VG.json b/data/chips/STM32L4Q5VG.json
index 8ad6327..b5d6c14 100644
--- a/data/chips/STM32L4Q5VG.json
+++ b/data/chips/STM32L4Q5VG.json
@@ -528,6 +528,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -631,15 +640,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4Q5ZG.json b/data/chips/STM32L4Q5ZG.json
index f700719..20ab9b7 100644
--- a/data/chips/STM32L4Q5ZG.json
+++ b/data/chips/STM32L4Q5ZG.json
@@ -520,6 +520,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1342440192,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1342439680,
@@ -623,15 +632,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1342440192,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1342570496,
diff --git a/data/chips/STM32L4R5AG.json b/data/chips/STM32L4R5AG.json
index 51308b4..dcff675 100644
--- a/data/chips/STM32L4R5AG.json
+++ b/data/chips/STM32L4R5AG.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R5AI.json b/data/chips/STM32L4R5AI.json
index e2124d5..5aca1fa 100644
--- a/data/chips/STM32L4R5AI.json
+++ b/data/chips/STM32L4R5AI.json
@@ -527,7 +527,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R5QG.json b/data/chips/STM32L4R5QG.json
index 93b8371..827a31a 100644
--- a/data/chips/STM32L4R5QG.json
+++ b/data/chips/STM32L4R5QG.json
@@ -527,7 +527,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R5QI.json b/data/chips/STM32L4R5QI.json
index c78f2f4..f83d284 100644
--- a/data/chips/STM32L4R5QI.json
+++ b/data/chips/STM32L4R5QI.json
@@ -527,7 +527,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R5VG.json b/data/chips/STM32L4R5VG.json
index cc2c20e..6a6a0d1 100644
--- a/data/chips/STM32L4R5VG.json
+++ b/data/chips/STM32L4R5VG.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R5VI.json b/data/chips/STM32L4R5VI.json
index 81b77bf..e47fc2f 100644
--- a/data/chips/STM32L4R5VI.json
+++ b/data/chips/STM32L4R5VI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R5ZG.json b/data/chips/STM32L4R5ZG.json
index 172fbb3..b677388 100644
--- a/data/chips/STM32L4R5ZG.json
+++ b/data/chips/STM32L4R5ZG.json
@@ -527,7 +527,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R5ZI.json b/data/chips/STM32L4R5ZI.json
index d831474..2aa06a1 100644
--- a/data/chips/STM32L4R5ZI.json
+++ b/data/chips/STM32L4R5ZI.json
@@ -537,7 +537,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R7AI.json b/data/chips/STM32L4R7AI.json
index 34b40f8..cb69418 100644
--- a/data/chips/STM32L4R7AI.json
+++ b/data/chips/STM32L4R7AI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R7VI.json b/data/chips/STM32L4R7VI.json
index ff0a9d0..1e7cdaa 100644
--- a/data/chips/STM32L4R7VI.json
+++ b/data/chips/STM32L4R7VI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R7ZI.json b/data/chips/STM32L4R7ZI.json
index 1e2b596..9f2a817 100644
--- a/data/chips/STM32L4R7ZI.json
+++ b/data/chips/STM32L4R7ZI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R9AG.json b/data/chips/STM32L4R9AG.json
index ae3d893..f254035 100644
--- a/data/chips/STM32L4R9AG.json
+++ b/data/chips/STM32L4R9AG.json
@@ -525,7 +525,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R9AI.json b/data/chips/STM32L4R9AI.json
index fc5a7bb..21fc153 100644
--- a/data/chips/STM32L4R9AI.json
+++ b/data/chips/STM32L4R9AI.json
@@ -525,7 +525,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R9VG.json b/data/chips/STM32L4R9VG.json
index 435ed6a..002654f 100644
--- a/data/chips/STM32L4R9VG.json
+++ b/data/chips/STM32L4R9VG.json
@@ -525,7 +525,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R9VI.json b/data/chips/STM32L4R9VI.json
index 790bcde..85a3a48 100644
--- a/data/chips/STM32L4R9VI.json
+++ b/data/chips/STM32L4R9VI.json
@@ -525,7 +525,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R9ZG.json b/data/chips/STM32L4R9ZG.json
index 4325f7b..f402f5d 100644
--- a/data/chips/STM32L4R9ZG.json
+++ b/data/chips/STM32L4R9ZG.json
@@ -537,7 +537,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4R9ZI.json b/data/chips/STM32L4R9ZI.json
index e8405dc..03b7831 100644
--- a/data/chips/STM32L4R9ZI.json
+++ b/data/chips/STM32L4R9ZI.json
@@ -547,7 +547,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S5AI.json b/data/chips/STM32L4S5AI.json
index 6322b7f..83a7d95 100644
--- a/data/chips/STM32L4S5AI.json
+++ b/data/chips/STM32L4S5AI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S5QI.json b/data/chips/STM32L4S5QI.json
index 4dc3085..b2a82a6 100644
--- a/data/chips/STM32L4S5QI.json
+++ b/data/chips/STM32L4S5QI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S5VI.json b/data/chips/STM32L4S5VI.json
index 236ce3e..09e0892 100644
--- a/data/chips/STM32L4S5VI.json
+++ b/data/chips/STM32L4S5VI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S5ZI.json b/data/chips/STM32L4S5ZI.json
index d59cf88..c2bb71c 100644
--- a/data/chips/STM32L4S5ZI.json
+++ b/data/chips/STM32L4S5ZI.json
@@ -527,7 +527,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S7AI.json b/data/chips/STM32L4S7AI.json
index 045c593..aa0449b 100644
--- a/data/chips/STM32L4S7AI.json
+++ b/data/chips/STM32L4S7AI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S7VI.json b/data/chips/STM32L4S7VI.json
index c73b01a..e124423 100644
--- a/data/chips/STM32L4S7VI.json
+++ b/data/chips/STM32L4S7VI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S7ZI.json b/data/chips/STM32L4S7ZI.json
index d5fc37b..253ace3 100644
--- a/data/chips/STM32L4S7ZI.json
+++ b/data/chips/STM32L4S7ZI.json
@@ -523,7 +523,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S9AI.json b/data/chips/STM32L4S9AI.json
index d125afe..0e39932 100644
--- a/data/chips/STM32L4S9AI.json
+++ b/data/chips/STM32L4S9AI.json
@@ -525,7 +525,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S9VI.json b/data/chips/STM32L4S9VI.json
index d3149c4..3fbbbf6 100644
--- a/data/chips/STM32L4S9VI.json
+++ b/data/chips/STM32L4S9VI.json
@@ -525,7 +525,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L4S9ZI.json b/data/chips/STM32L4S9ZI.json
index 7dd8397..3eb70a6 100644
--- a/data/chips/STM32L4S9ZI.json
+++ b/data/chips/STM32L4S9ZI.json
@@ -537,7 +537,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32L552CC.json b/data/chips/STM32L552CC.json
index 61541aa..ecec16a 100644
--- a/data/chips/STM32L552CC.json
+++ b/data/chips/STM32L552CC.json
@@ -358,6 +358,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -437,15 +446,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552CE.json b/data/chips/STM32L552CE.json
index 79d4d22..3e3e617 100644
--- a/data/chips/STM32L552CE.json
+++ b/data/chips/STM32L552CE.json
@@ -366,6 +366,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -445,15 +454,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552ME.json b/data/chips/STM32L552ME.json
index cc7cf7f..bf47a7c 100644
--- a/data/chips/STM32L552ME.json
+++ b/data/chips/STM32L552ME.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -477,15 +486,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552QC.json b/data/chips/STM32L552QC.json
index 70dc76f..365526e 100644
--- a/data/chips/STM32L552QC.json
+++ b/data/chips/STM32L552QC.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -481,15 +490,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552QE.json b/data/chips/STM32L552QE.json
index ad2c749..a457cd9 100644
--- a/data/chips/STM32L552QE.json
+++ b/data/chips/STM32L552QE.json
@@ -386,6 +386,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -489,15 +498,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552RC.json b/data/chips/STM32L552RC.json
index 42341ad..4b268e1 100644
--- a/data/chips/STM32L552RC.json
+++ b/data/chips/STM32L552RC.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -481,15 +490,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552RE.json b/data/chips/STM32L552RE.json
index 01d4d08..ceaedf6 100644
--- a/data/chips/STM32L552RE.json
+++ b/data/chips/STM32L552RE.json
@@ -386,6 +386,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -489,15 +498,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552VC.json b/data/chips/STM32L552VC.json
index 93840e1..be389c4 100644
--- a/data/chips/STM32L552VC.json
+++ b/data/chips/STM32L552VC.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -481,15 +490,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552VE.json b/data/chips/STM32L552VE.json
index ea9d8be..09f92d5 100644
--- a/data/chips/STM32L552VE.json
+++ b/data/chips/STM32L552VE.json
@@ -382,6 +382,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -485,15 +494,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552ZC.json b/data/chips/STM32L552ZC.json
index 3a851a6..37e5d5b 100644
--- a/data/chips/STM32L552ZC.json
+++ b/data/chips/STM32L552ZC.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -481,15 +490,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L552ZE.json b/data/chips/STM32L552ZE.json
index e881675..0d965e1 100644
--- a/data/chips/STM32L552ZE.json
+++ b/data/chips/STM32L552ZE.json
@@ -382,6 +382,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -485,15 +494,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "COMP1",
                     "address": 1073807872,
diff --git a/data/chips/STM32L562CE.json b/data/chips/STM32L562CE.json
index b639923..225643a 100644
--- a/data/chips/STM32L562CE.json
+++ b/data/chips/STM32L562CE.json
@@ -366,6 +366,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -445,15 +454,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32L562ME.json b/data/chips/STM32L562ME.json
index 3a33eb9..a1cb79d 100644
--- a/data/chips/STM32L562ME.json
+++ b/data/chips/STM32L562ME.json
@@ -378,6 +378,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -477,15 +486,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32L562QE.json b/data/chips/STM32L562QE.json
index 6c8bf6e..3633411 100644
--- a/data/chips/STM32L562QE.json
+++ b/data/chips/STM32L562QE.json
@@ -386,6 +386,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -489,15 +498,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32L562RE.json b/data/chips/STM32L562RE.json
index 7a10cd7..7b23060 100644
--- a/data/chips/STM32L562RE.json
+++ b/data/chips/STM32L562RE.json
@@ -386,6 +386,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -489,15 +498,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32L562VE.json b/data/chips/STM32L562VE.json
index eac6480..de495c9 100644
--- a/data/chips/STM32L562VE.json
+++ b/data/chips/STM32L562VE.json
@@ -382,6 +382,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -485,15 +494,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32L562ZE.json b/data/chips/STM32L562ZE.json
index d4b29d0..84bdf1f 100644
--- a/data/chips/STM32L562ZE.json
+++ b/data/chips/STM32L562ZE.json
@@ -382,6 +382,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -485,15 +494,6 @@
                         }
                     ]
                 },
-                {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864,
-                    "registers": {
-                        "kind": "adccommon",
-                        "version": "v3",
-                        "block": "ADC_COMMON"
-                    }
-                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32U031C6.json b/data/chips/STM32U031C6.json
index d89e0f3..2cf32ba 100644
--- a/data/chips/STM32U031C6.json
+++ b/data/chips/STM32U031C6.json
@@ -118,7 +118,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031C8.json b/data/chips/STM32U031C8.json
index 4efb1b5..b0d015e 100644
--- a/data/chips/STM32U031C8.json
+++ b/data/chips/STM32U031C8.json
@@ -118,7 +118,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031F4.json b/data/chips/STM32U031F4.json
index b879731..22e1003 100644
--- a/data/chips/STM32U031F4.json
+++ b/data/chips/STM32U031F4.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031F6.json b/data/chips/STM32U031F6.json
index dc8a5f2..1566c9b 100644
--- a/data/chips/STM32U031F6.json
+++ b/data/chips/STM32U031F6.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031F8.json b/data/chips/STM32U031F8.json
index b403961..9d28950 100644
--- a/data/chips/STM32U031F8.json
+++ b/data/chips/STM32U031F8.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031G6.json b/data/chips/STM32U031G6.json
index 27ee7e2..6385d64 100644
--- a/data/chips/STM32U031G6.json
+++ b/data/chips/STM32U031G6.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031G8.json b/data/chips/STM32U031G8.json
index 80da4e4..88998a9 100644
--- a/data/chips/STM32U031G8.json
+++ b/data/chips/STM32U031G8.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031K4.json b/data/chips/STM32U031K4.json
index f6bcad0..0e6ed01 100644
--- a/data/chips/STM32U031K4.json
+++ b/data/chips/STM32U031K4.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031K6.json b/data/chips/STM32U031K6.json
index 42bb8da..175125b 100644
--- a/data/chips/STM32U031K6.json
+++ b/data/chips/STM32U031K6.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031K8.json b/data/chips/STM32U031K8.json
index 78ffadf..0c3a3f6 100644
--- a/data/chips/STM32U031K8.json
+++ b/data/chips/STM32U031K8.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031R6.json b/data/chips/STM32U031R6.json
index 2b5e124..60a607d 100644
--- a/data/chips/STM32U031R6.json
+++ b/data/chips/STM32U031R6.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U031R8.json b/data/chips/STM32U031R8.json
index d412299..6a2c382 100644
--- a/data/chips/STM32U031R8.json
+++ b/data/chips/STM32U031R8.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073C8.json b/data/chips/STM32U073C8.json
index af5da5a..ff67dba 100644
--- a/data/chips/STM32U073C8.json
+++ b/data/chips/STM32U073C8.json
@@ -118,7 +118,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073CB.json b/data/chips/STM32U073CB.json
index 2e391cb..a54895f 100644
--- a/data/chips/STM32U073CB.json
+++ b/data/chips/STM32U073CB.json
@@ -118,7 +118,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073CC.json b/data/chips/STM32U073CC.json
index 6ccd924..47d0b07 100644
--- a/data/chips/STM32U073CC.json
+++ b/data/chips/STM32U073CC.json
@@ -118,7 +118,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073H8.json b/data/chips/STM32U073H8.json
index fc19eec..10c4b79 100644
--- a/data/chips/STM32U073H8.json
+++ b/data/chips/STM32U073H8.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073HB.json b/data/chips/STM32U073HB.json
index c21ec69..2afddf7 100644
--- a/data/chips/STM32U073HB.json
+++ b/data/chips/STM32U073HB.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073HC.json b/data/chips/STM32U073HC.json
index b4dda14..c49cdab 100644
--- a/data/chips/STM32U073HC.json
+++ b/data/chips/STM32U073HC.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073K8.json b/data/chips/STM32U073K8.json
index 255f020..5ad77ed 100644
--- a/data/chips/STM32U073K8.json
+++ b/data/chips/STM32U073K8.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073KB.json b/data/chips/STM32U073KB.json
index c6bef94..2a70f5a 100644
--- a/data/chips/STM32U073KB.json
+++ b/data/chips/STM32U073KB.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073KC.json b/data/chips/STM32U073KC.json
index a3d729f..13c156a 100644
--- a/data/chips/STM32U073KC.json
+++ b/data/chips/STM32U073KC.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073M8.json b/data/chips/STM32U073M8.json
index cf9f43e..79b9405 100644
--- a/data/chips/STM32U073M8.json
+++ b/data/chips/STM32U073M8.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073MB.json b/data/chips/STM32U073MB.json
index 88fc793..b730eaa 100644
--- a/data/chips/STM32U073MB.json
+++ b/data/chips/STM32U073MB.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073MC.json b/data/chips/STM32U073MC.json
index 3bf005b..1c314bc 100644
--- a/data/chips/STM32U073MC.json
+++ b/data/chips/STM32U073MC.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073R8.json b/data/chips/STM32U073R8.json
index 0b55bbb..e38bc58 100644
--- a/data/chips/STM32U073R8.json
+++ b/data/chips/STM32U073R8.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073RB.json b/data/chips/STM32U073RB.json
index 2d812e2..ef85957 100644
--- a/data/chips/STM32U073RB.json
+++ b/data/chips/STM32U073RB.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U073RC.json b/data/chips/STM32U073RC.json
index c12f619..8b5081d 100644
--- a/data/chips/STM32U073RC.json
+++ b/data/chips/STM32U073RC.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U083CC.json b/data/chips/STM32U083CC.json
index 2dba2fc..b1afe84 100644
--- a/data/chips/STM32U083CC.json
+++ b/data/chips/STM32U083CC.json
@@ -118,7 +118,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U083HC.json b/data/chips/STM32U083HC.json
index ab1531d..ae811a0 100644
--- a/data/chips/STM32U083HC.json
+++ b/data/chips/STM32U083HC.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U083KC.json b/data/chips/STM32U083KC.json
index 078349d..17e8a2a 100644
--- a/data/chips/STM32U083KC.json
+++ b/data/chips/STM32U083KC.json
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U083MC.json b/data/chips/STM32U083MC.json
index 6b194f0..c733474 100644
--- a/data/chips/STM32U083MC.json
+++ b/data/chips/STM32U083MC.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U083RC.json b/data/chips/STM32U083RC.json
index 0c1637a..a037b10 100644
--- a/data/chips/STM32U083RC.json
+++ b/data/chips/STM32U083RC.json
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32U535CB.json b/data/chips/STM32U535CB.json
index 2eaa874..1fb53fa 100644
--- a/data/chips/STM32U535CB.json
+++ b/data/chips/STM32U535CB.json
@@ -141,6 +141,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -200,8 +204,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535CC.json b/data/chips/STM32U535CC.json
index d3f4ef9..daf90f4 100644
--- a/data/chips/STM32U535CC.json
+++ b/data/chips/STM32U535CC.json
@@ -141,6 +141,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -200,8 +204,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535CE.json b/data/chips/STM32U535CE.json
index 7ae84fe..cdac95d 100644
--- a/data/chips/STM32U535CE.json
+++ b/data/chips/STM32U535CE.json
@@ -141,6 +141,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -200,8 +204,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535JE.json b/data/chips/STM32U535JE.json
index f93826a..fbd58ff 100644
--- a/data/chips/STM32U535JE.json
+++ b/data/chips/STM32U535JE.json
@@ -133,6 +133,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -196,8 +200,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535NC.json b/data/chips/STM32U535NC.json
index 36b3306..c48e027 100644
--- a/data/chips/STM32U535NC.json
+++ b/data/chips/STM32U535NC.json
@@ -129,6 +129,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -188,8 +192,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535NE.json b/data/chips/STM32U535NE.json
index 91393cd..424ed4a 100644
--- a/data/chips/STM32U535NE.json
+++ b/data/chips/STM32U535NE.json
@@ -129,6 +129,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -188,8 +192,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535RB.json b/data/chips/STM32U535RB.json
index c0a3b71..0144d73 100644
--- a/data/chips/STM32U535RB.json
+++ b/data/chips/STM32U535RB.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -248,8 +252,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535RC.json b/data/chips/STM32U535RC.json
index a4aeff1..384236f 100644
--- a/data/chips/STM32U535RC.json
+++ b/data/chips/STM32U535RC.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -248,8 +252,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535RE.json b/data/chips/STM32U535RE.json
index fd9c5ce..5bf52db 100644
--- a/data/chips/STM32U535RE.json
+++ b/data/chips/STM32U535RE.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -248,8 +252,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535VC.json b/data/chips/STM32U535VC.json
index 7ab2308..3cff556 100644
--- a/data/chips/STM32U535VC.json
+++ b/data/chips/STM32U535VC.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -260,8 +264,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U535VE.json b/data/chips/STM32U535VE.json
index f4621df..2742b4e 100644
--- a/data/chips/STM32U535VE.json
+++ b/data/chips/STM32U535VE.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -260,8 +264,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U545CE.json b/data/chips/STM32U545CE.json
index 6d6d26b..7fd8b98 100644
--- a/data/chips/STM32U545CE.json
+++ b/data/chips/STM32U545CE.json
@@ -141,6 +141,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -200,8 +204,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U545JE.json b/data/chips/STM32U545JE.json
index 31fdf31..09cc8f0 100644
--- a/data/chips/STM32U545JE.json
+++ b/data/chips/STM32U545JE.json
@@ -133,6 +133,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -196,8 +200,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U545NE.json b/data/chips/STM32U545NE.json
index 32addf5..8467050 100644
--- a/data/chips/STM32U545NE.json
+++ b/data/chips/STM32U545NE.json
@@ -129,6 +129,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -188,8 +192,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U545RE.json b/data/chips/STM32U545RE.json
index bf2b708..9919e09 100644
--- a/data/chips/STM32U545RE.json
+++ b/data/chips/STM32U545RE.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -248,8 +252,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U545VE.json b/data/chips/STM32U545VE.json
index 1516be3..9b4ad4e 100644
--- a/data/chips/STM32U545VE.json
+++ b/data/chips/STM32U545VE.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -260,8 +264,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575AG.json b/data/chips/STM32U575AG.json
index 44d9a5b..787e97c 100644
--- a/data/chips/STM32U575AG.json
+++ b/data/chips/STM32U575AG.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -641,8 +645,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575AI.json b/data/chips/STM32U575AI.json
index 697c88b..def300b 100644
--- a/data/chips/STM32U575AI.json
+++ b/data/chips/STM32U575AI.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -641,8 +645,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575CG.json b/data/chips/STM32U575CG.json
index a67e01e..884d99d 100644
--- a/data/chips/STM32U575CG.json
+++ b/data/chips/STM32U575CG.json
@@ -514,6 +514,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -573,8 +577,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575CI.json b/data/chips/STM32U575CI.json
index 41b4964..7cbf865 100644
--- a/data/chips/STM32U575CI.json
+++ b/data/chips/STM32U575CI.json
@@ -514,6 +514,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -573,8 +577,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575OG.json b/data/chips/STM32U575OG.json
index 5eaf2da..d5caba0 100644
--- a/data/chips/STM32U575OG.json
+++ b/data/chips/STM32U575OG.json
@@ -522,6 +522,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -601,8 +605,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575OI.json b/data/chips/STM32U575OI.json
index 9b93e5d..815c5c0 100644
--- a/data/chips/STM32U575OI.json
+++ b/data/chips/STM32U575OI.json
@@ -522,6 +522,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -601,8 +605,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575QG.json b/data/chips/STM32U575QG.json
index a811b91..a60878e 100644
--- a/data/chips/STM32U575QG.json
+++ b/data/chips/STM32U575QG.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -641,8 +645,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575QI.json b/data/chips/STM32U575QI.json
index ea31d91..533aa55 100644
--- a/data/chips/STM32U575QI.json
+++ b/data/chips/STM32U575QI.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -641,8 +645,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575RG.json b/data/chips/STM32U575RG.json
index 05c5b28..21bc690 100644
--- a/data/chips/STM32U575RG.json
+++ b/data/chips/STM32U575RG.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -613,8 +617,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575RI.json b/data/chips/STM32U575RI.json
index eb38a9a..1e3b222 100644
--- a/data/chips/STM32U575RI.json
+++ b/data/chips/STM32U575RI.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -613,8 +617,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575VG.json b/data/chips/STM32U575VG.json
index 2f22eee..5890c88 100644
--- a/data/chips/STM32U575VG.json
+++ b/data/chips/STM32U575VG.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -625,8 +629,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575VI.json b/data/chips/STM32U575VI.json
index 38de410..695e32f 100644
--- a/data/chips/STM32U575VI.json
+++ b/data/chips/STM32U575VI.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -625,8 +629,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575ZG.json b/data/chips/STM32U575ZG.json
index 1fba183..d55dd19 100644
--- a/data/chips/STM32U575ZG.json
+++ b/data/chips/STM32U575ZG.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -641,8 +645,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U575ZI.json b/data/chips/STM32U575ZI.json
index 24f95dc..1f0c5ee 100644
--- a/data/chips/STM32U575ZI.json
+++ b/data/chips/STM32U575ZI.json
@@ -530,6 +530,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -641,8 +645,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U585AI.json b/data/chips/STM32U585AI.json
index 18b4628..1defddb 100644
--- a/data/chips/STM32U585AI.json
+++ b/data/chips/STM32U585AI.json
@@ -536,6 +536,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -647,8 +651,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U585CI.json b/data/chips/STM32U585CI.json
index 04171f3..ebc959e 100644
--- a/data/chips/STM32U585CI.json
+++ b/data/chips/STM32U585CI.json
@@ -520,6 +520,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -579,8 +583,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U585OI.json b/data/chips/STM32U585OI.json
index 09f62f4..6e9166d 100644
--- a/data/chips/STM32U585OI.json
+++ b/data/chips/STM32U585OI.json
@@ -528,6 +528,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -607,8 +611,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U585QI.json b/data/chips/STM32U585QI.json
index dc9532e..aace9a5 100644
--- a/data/chips/STM32U585QI.json
+++ b/data/chips/STM32U585QI.json
@@ -536,6 +536,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -647,8 +651,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U585RI.json b/data/chips/STM32U585RI.json
index 6972853..ba3342e 100644
--- a/data/chips/STM32U585RI.json
+++ b/data/chips/STM32U585RI.json
@@ -536,6 +536,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -619,8 +623,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U585VI.json b/data/chips/STM32U585VI.json
index e0da1a9..c4c0c5e 100644
--- a/data/chips/STM32U585VI.json
+++ b/data/chips/STM32U585VI.json
@@ -536,6 +536,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -631,8 +635,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U585ZI.json b/data/chips/STM32U585ZI.json
index 8777ccd..d25f582 100644
--- a/data/chips/STM32U585ZI.json
+++ b/data/chips/STM32U585ZI.json
@@ -536,6 +536,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460872
+                },
                 {
                     "name": "ADC4",
                     "address": 1174540288,
@@ -647,8 +651,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460872
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595AI.json b/data/chips/STM32U595AI.json
index 68b0785..ab52182 100644
--- a/data/chips/STM32U595AI.json
+++ b/data/chips/STM32U595AI.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595AJ.json b/data/chips/STM32U595AJ.json
index f3ca162..eee9b30 100644
--- a/data/chips/STM32U595AJ.json
+++ b/data/chips/STM32U595AJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595QI.json b/data/chips/STM32U595QI.json
index 35ed89d..1cdf681 100644
--- a/data/chips/STM32U595QI.json
+++ b/data/chips/STM32U595QI.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595QJ.json b/data/chips/STM32U595QJ.json
index 934c07c..78f0e99 100644
--- a/data/chips/STM32U595QJ.json
+++ b/data/chips/STM32U595QJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595RI.json b/data/chips/STM32U595RI.json
index 8964687..0345c28 100644
--- a/data/chips/STM32U595RI.json
+++ b/data/chips/STM32U595RI.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -347,8 +351,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595RJ.json b/data/chips/STM32U595RJ.json
index 510aa70..f8b2c2f 100644
--- a/data/chips/STM32U595RJ.json
+++ b/data/chips/STM32U595RJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -347,8 +351,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595VI.json b/data/chips/STM32U595VI.json
index 1ecbd80..a67c686 100644
--- a/data/chips/STM32U595VI.json
+++ b/data/chips/STM32U595VI.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,8 +363,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595VJ.json b/data/chips/STM32U595VJ.json
index bbc961c..0bb528f 100644
--- a/data/chips/STM32U595VJ.json
+++ b/data/chips/STM32U595VJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,8 +363,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595ZI.json b/data/chips/STM32U595ZI.json
index 1d1183f..7c9c697 100644
--- a/data/chips/STM32U595ZI.json
+++ b/data/chips/STM32U595ZI.json
@@ -173,6 +173,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -379,8 +383,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U595ZJ.json b/data/chips/STM32U595ZJ.json
index f0dd5c6..1cebcf0 100644
--- a/data/chips/STM32U595ZJ.json
+++ b/data/chips/STM32U595ZJ.json
@@ -173,6 +173,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -379,8 +383,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U599BJ.json b/data/chips/STM32U599BJ.json
index db463f1..c04f78e 100644
--- a/data/chips/STM32U599BJ.json
+++ b/data/chips/STM32U599BJ.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -371,8 +375,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U599NI.json b/data/chips/STM32U599NI.json
index e4afd67..2d3cbf7 100644
--- a/data/chips/STM32U599NI.json
+++ b/data/chips/STM32U599NI.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -371,8 +375,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U599NJ.json b/data/chips/STM32U599NJ.json
index fafb358..8b62460 100644
--- a/data/chips/STM32U599NJ.json
+++ b/data/chips/STM32U599NJ.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -371,8 +375,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U599VI.json b/data/chips/STM32U599VI.json
index a6d13f3..343477b 100644
--- a/data/chips/STM32U599VI.json
+++ b/data/chips/STM32U599VI.json
@@ -157,6 +157,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -331,8 +335,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U599VJ.json b/data/chips/STM32U599VJ.json
index ed0f949..4d66f75 100644
--- a/data/chips/STM32U599VJ.json
+++ b/data/chips/STM32U599VJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,8 +363,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U599ZI.json b/data/chips/STM32U599ZI.json
index 11e8ebc..33d752f 100644
--- a/data/chips/STM32U599ZI.json
+++ b/data/chips/STM32U599ZI.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U599ZJ.json b/data/chips/STM32U599ZJ.json
index 6430911..5300e40 100644
--- a/data/chips/STM32U599ZJ.json
+++ b/data/chips/STM32U599ZJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A5AJ.json b/data/chips/STM32U5A5AJ.json
index cc846ba..8be72e7 100644
--- a/data/chips/STM32U5A5AJ.json
+++ b/data/chips/STM32U5A5AJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A5QI.json b/data/chips/STM32U5A5QI.json
index a04159a..2cf1d15 100644
--- a/data/chips/STM32U5A5QI.json
+++ b/data/chips/STM32U5A5QI.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -371,8 +375,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A5QJ.json b/data/chips/STM32U5A5QJ.json
index 0f7117e..a41fed1 100644
--- a/data/chips/STM32U5A5QJ.json
+++ b/data/chips/STM32U5A5QJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A5RJ.json b/data/chips/STM32U5A5RJ.json
index 7f84e44..72336a6 100644
--- a/data/chips/STM32U5A5RJ.json
+++ b/data/chips/STM32U5A5RJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -347,8 +351,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A5VJ.json b/data/chips/STM32U5A5VJ.json
index 62f2bb0..48b69ad 100644
--- a/data/chips/STM32U5A5VJ.json
+++ b/data/chips/STM32U5A5VJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -359,8 +363,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A5ZJ.json b/data/chips/STM32U5A5ZJ.json
index 64355e6..f2470e8 100644
--- a/data/chips/STM32U5A5ZJ.json
+++ b/data/chips/STM32U5A5ZJ.json
@@ -173,6 +173,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -379,8 +383,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A9BJ.json b/data/chips/STM32U5A9BJ.json
index 2c695ca..7493d68 100644
--- a/data/chips/STM32U5A9BJ.json
+++ b/data/chips/STM32U5A9BJ.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -371,8 +375,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A9NJ.json b/data/chips/STM32U5A9NJ.json
index 9ccbf9d..52739e9 100644
--- a/data/chips/STM32U5A9NJ.json
+++ b/data/chips/STM32U5A9NJ.json
@@ -165,6 +165,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -371,8 +375,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A9VJ.json b/data/chips/STM32U5A9VJ.json
index e26ba79..4a7a377 100644
--- a/data/chips/STM32U5A9VJ.json
+++ b/data/chips/STM32U5A9VJ.json
@@ -157,6 +157,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -331,8 +335,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32U5A9ZJ.json b/data/chips/STM32U5A9ZJ.json
index 10a57ec..620a752 100644
--- a/data/chips/STM32U5A9ZJ.json
+++ b/data/chips/STM32U5A9ZJ.json
@@ -169,6 +169,10 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC12_COMMON",
+                    "address": 1107460864
+                },
                 {
                     "name": "ADC2",
                     "address": 1107460352,
@@ -375,8 +379,8 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1107460864
+                    "name": "ADC4_COMMON",
+                    "address": 1174541056
                 },
                 {
                     "name": "ADF1",
diff --git a/data/chips/STM32WB10CC.json b/data/chips/STM32WB10CC.json
index c7be49b..606b6c9 100644
--- a/data/chips/STM32WB10CC.json
+++ b/data/chips/STM32WB10CC.json
@@ -602,8 +602,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073817344
+                    "name": "ADC1_COMMON",
+                    "address": 1073817344,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "AES2",
diff --git a/data/chips/STM32WB15CC.json b/data/chips/STM32WB15CC.json
index 3bb9c33..7173584 100644
--- a/data/chips/STM32WB15CC.json
+++ b/data/chips/STM32WB15CC.json
@@ -622,8 +622,13 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
-                    "address": 1073817344
+                    "name": "ADC1_COMMON",
+                    "address": 1073817344,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
                 },
                 {
                     "name": "AES2",
diff --git a/data/chips/STM32WB30CE.json b/data/chips/STM32WB30CE.json
index fa48b4f..371a1cb 100644
--- a/data/chips/STM32WB30CE.json
+++ b/data/chips/STM32WB30CE.json
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB35CC.json b/data/chips/STM32WB35CC.json
index bbc88c6..5367c1e 100644
--- a/data/chips/STM32WB35CC.json
+++ b/data/chips/STM32WB35CC.json
@@ -451,7 +451,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB35CE.json b/data/chips/STM32WB35CE.json
index fbee787..7452fbd 100644
--- a/data/chips/STM32WB35CE.json
+++ b/data/chips/STM32WB35CE.json
@@ -451,7 +451,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB50CG.json b/data/chips/STM32WB50CG.json
index 07e223c..800c8a0 100644
--- a/data/chips/STM32WB50CG.json
+++ b/data/chips/STM32WB50CG.json
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55CC.json b/data/chips/STM32WB55CC.json
index 441a713..f5f64bf 100644
--- a/data/chips/STM32WB55CC.json
+++ b/data/chips/STM32WB55CC.json
@@ -451,7 +451,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55CE.json b/data/chips/STM32WB55CE.json
index bc87e61..acd1e74 100644
--- a/data/chips/STM32WB55CE.json
+++ b/data/chips/STM32WB55CE.json
@@ -451,7 +451,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55CG.json b/data/chips/STM32WB55CG.json
index 52afcec..695bdcb 100644
--- a/data/chips/STM32WB55CG.json
+++ b/data/chips/STM32WB55CG.json
@@ -451,7 +451,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55RC.json b/data/chips/STM32WB55RC.json
index 1293283..003b13e 100644
--- a/data/chips/STM32WB55RC.json
+++ b/data/chips/STM32WB55RC.json
@@ -475,7 +475,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55RE.json b/data/chips/STM32WB55RE.json
index 48dd531..3af8bc3 100644
--- a/data/chips/STM32WB55RE.json
+++ b/data/chips/STM32WB55RE.json
@@ -475,7 +475,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55RG.json b/data/chips/STM32WB55RG.json
index 6391759..9fdfe83 100644
--- a/data/chips/STM32WB55RG.json
+++ b/data/chips/STM32WB55RG.json
@@ -475,7 +475,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55VC.json b/data/chips/STM32WB55VC.json
index b7f6606..2aad5ac 100644
--- a/data/chips/STM32WB55VC.json
+++ b/data/chips/STM32WB55VC.json
@@ -479,7 +479,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55VE.json b/data/chips/STM32WB55VE.json
index d88fcc2..7cbdfbc 100644
--- a/data/chips/STM32WB55VE.json
+++ b/data/chips/STM32WB55VE.json
@@ -479,7 +479,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55VG.json b/data/chips/STM32WB55VG.json
index 54f4ca7..1b42cb6 100644
--- a/data/chips/STM32WB55VG.json
+++ b/data/chips/STM32WB55VG.json
@@ -479,7 +479,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WB55VY.json b/data/chips/STM32WB55VY.json
index 37c573b..0bc5ddf 100644
--- a/data/chips/STM32WB55VY.json
+++ b/data/chips/STM32WB55VY.json
@@ -457,7 +457,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1342440192,
                     "registers": {
                         "kind": "adccommon",
diff --git a/data/chips/STM32WBA52CE.json b/data/chips/STM32WBA52CE.json
index 3fa3c65..e69ec9e 100644
--- a/data/chips/STM32WBA52CE.json
+++ b/data/chips/STM32WBA52CE.json
@@ -110,6 +110,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32WBA52CG.json b/data/chips/STM32WBA52CG.json
index 522fe02..14f3618 100644
--- a/data/chips/STM32WBA52CG.json
+++ b/data/chips/STM32WBA52CG.json
@@ -110,6 +110,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32WBA52KE.json b/data/chips/STM32WBA52KE.json
index 92cd9c0..cf4378a 100644
--- a/data/chips/STM32WBA52KE.json
+++ b/data/chips/STM32WBA52KE.json
@@ -106,6 +106,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32WBA52KG.json b/data/chips/STM32WBA52KG.json
index 7b75526..85c8625 100644
--- a/data/chips/STM32WBA52KG.json
+++ b/data/chips/STM32WBA52KG.json
@@ -106,6 +106,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "ADC4_COMMON",
+                    "address": 1174541064,
+                    "registers": {
+                        "kind": "adccommon",
+                        "version": "v3",
+                        "block": "ADC_COMMON"
+                    }
+                },
                 {
                     "name": "AES",
                     "address": 1108082688,
diff --git a/data/chips/STM32WL54CC.json b/data/chips/STM32WL54CC.json
index 829394a..cb7a5c6 100644
--- a/data/chips/STM32WL54CC.json
+++ b/data/chips/STM32WL54CC.json
@@ -222,7 +222,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -297,7 +297,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1783,6 +1783,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
@@ -2816,7 +2822,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -2891,7 +2897,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -4352,6 +4358,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WL54JC.json b/data/chips/STM32WL54JC.json
index e628b5a..722bb37 100644
--- a/data/chips/STM32WL54JC.json
+++ b/data/chips/STM32WL54JC.json
@@ -222,7 +222,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1999,6 +1999,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
@@ -3067,7 +3073,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -3154,7 +3160,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -4819,6 +4825,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WL55CC.json b/data/chips/STM32WL55CC.json
index 19d9ec6..de6acbd 100644
--- a/data/chips/STM32WL55CC.json
+++ b/data/chips/STM32WL55CC.json
@@ -228,7 +228,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -303,7 +303,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1789,6 +1789,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
@@ -2822,7 +2828,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -2897,7 +2903,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -4358,6 +4364,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WL55JC.json b/data/chips/STM32WL55JC.json
index deafbfa..70aef6c 100644
--- a/data/chips/STM32WL55JC.json
+++ b/data/chips/STM32WL55JC.json
@@ -228,7 +228,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -315,7 +315,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -2005,6 +2005,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
@@ -3073,7 +3079,7 @@
             "name": "cm0p",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -3160,7 +3166,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -4825,6 +4831,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE4C8.json b/data/chips/STM32WLE4C8.json
index cb32b51..c8c8a6c 100644
--- a/data/chips/STM32WLE4C8.json
+++ b/data/chips/STM32WLE4C8.json
@@ -41,7 +41,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -116,7 +116,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1571,6 +1571,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE4CB.json b/data/chips/STM32WLE4CB.json
index c84b9d9..ece5278 100644
--- a/data/chips/STM32WLE4CB.json
+++ b/data/chips/STM32WLE4CB.json
@@ -41,7 +41,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -116,7 +116,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1571,6 +1571,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE4CC.json b/data/chips/STM32WLE4CC.json
index fddf424..6db2394 100644
--- a/data/chips/STM32WLE4CC.json
+++ b/data/chips/STM32WLE4CC.json
@@ -216,7 +216,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -291,7 +291,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1746,6 +1746,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE4J8.json b/data/chips/STM32WLE4J8.json
index d2b7aef..77ac89a 100644
--- a/data/chips/STM32WLE4J8.json
+++ b/data/chips/STM32WLE4J8.json
@@ -41,7 +41,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1787,6 +1787,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE4JB.json b/data/chips/STM32WLE4JB.json
index 573845c..4abb119 100644
--- a/data/chips/STM32WLE4JB.json
+++ b/data/chips/STM32WLE4JB.json
@@ -41,7 +41,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1787,6 +1787,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE4JC.json b/data/chips/STM32WLE4JC.json
index 786e38d..d013e51 100644
--- a/data/chips/STM32WLE4JC.json
+++ b/data/chips/STM32WLE4JC.json
@@ -216,7 +216,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -303,7 +303,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1962,6 +1962,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE5C8.json b/data/chips/STM32WLE5C8.json
index 2a690e5..9ef4a71 100644
--- a/data/chips/STM32WLE5C8.json
+++ b/data/chips/STM32WLE5C8.json
@@ -216,7 +216,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -291,7 +291,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1746,6 +1746,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE5CB.json b/data/chips/STM32WLE5CB.json
index 2334c83..8915e3d 100644
--- a/data/chips/STM32WLE5CB.json
+++ b/data/chips/STM32WLE5CB.json
@@ -216,7 +216,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -291,7 +291,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1746,6 +1746,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE5CC.json b/data/chips/STM32WLE5CC.json
index 143c18d..060ae66 100644
--- a/data/chips/STM32WLE5CC.json
+++ b/data/chips/STM32WLE5CC.json
@@ -216,7 +216,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -291,7 +291,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1746,6 +1746,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE5J8.json b/data/chips/STM32WLE5J8.json
index 15dbd17..0844fc7 100644
--- a/data/chips/STM32WLE5J8.json
+++ b/data/chips/STM32WLE5J8.json
@@ -216,7 +216,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -303,7 +303,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1962,6 +1962,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE5JB.json b/data/chips/STM32WLE5JB.json
index a2f55d0..2ec4a86 100644
--- a/data/chips/STM32WLE5JB.json
+++ b/data/chips/STM32WLE5JB.json
@@ -216,7 +216,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -303,7 +303,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1962,6 +1962,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",
diff --git a/data/chips/STM32WLE5JC.json b/data/chips/STM32WLE5JC.json
index 658cc3c..418ae28 100644
--- a/data/chips/STM32WLE5JC.json
+++ b/data/chips/STM32WLE5JC.json
@@ -216,7 +216,7 @@
             "name": "cm4",
             "peripherals": [
                 {
-                    "name": "ADC",
+                    "name": "ADC1",
                     "address": 1073816576,
                     "registers": {
                         "kind": "adc",
@@ -303,7 +303,7 @@
                     ]
                 },
                 {
-                    "name": "ADC_COMMON",
+                    "name": "ADC1_COMMON",
                     "address": 1073817352,
                     "registers": {
                         "kind": "adccommon",
@@ -1962,6 +1962,12 @@
                             "af": 13
                         }
                     ],
+                    "interrupts": [
+                        {
+                            "signal": "RADIO",
+                            "interrupt": "SUBGHZ_Radio"
+                        }
+                    ],
                     "dma_channels": [
                         {
                             "signal": "RX",