diff --git a/data/extra/chip_name/STM32F303CB.yaml b/data/extra/chip_name/STM32F303CB.yaml
deleted file mode 100644
index 981a349..0000000
--- a/data/extra/chip_name/STM32F303CB.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-peripherals:
-  - name: ADC3_COMMON
-    address: 0x50000700
-    registers: 
-      kind: adccommon
-      version: f3
-      block: ADCCOMMON
diff --git a/data/extra/chip_name/STM32F303CC.yaml b/data/extra/chip_name/STM32F303CC.yaml
deleted file mode 100644
index 981a349..0000000
--- a/data/extra/chip_name/STM32F303CC.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-peripherals:
-  - name: ADC3_COMMON
-    address: 0x50000700
-    registers: 
-      kind: adccommon
-      version: f3
-      block: ADCCOMMON
diff --git a/data/extra/chip_name/STM32F303VC.yaml b/data/extra/chip_name/STM32F303VC.yaml
deleted file mode 100644
index 981a349..0000000
--- a/data/extra/chip_name/STM32F303VC.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-peripherals:
-  - name: ADC3_COMMON
-    address: 0x50000700
-    registers: 
-      kind: adccommon
-      version: f3
-      block: ADCCOMMON
diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs
index c46d123..4d154ac 100644
--- a/stm32-data-gen/src/chips.rs
+++ b/stm32-data-gen/src/chips.rs
@@ -184,6 +184,7 @@ impl PeriMatcher {
             (".*:ADC_COMMON:aditf5_v2_2", ("adccommon", "v3", "ADC_COMMON")),
             (".*:ADC_COMMON:aditf4_v3_0_WL", ("adccommon", "v3", "ADC_COMMON")),
             (".*:ADC_COMMON:aditf5_v1_1", ("adccommon", "f3", "ADC_COMMON")),
+            (".*:ADC3_COMMON:aditf5_v1_1", ("adccommon", "f3", "ADC_COMMON")),
             ("STM32H7.*:ADC_COMMON:.*", ("adccommon", "v4", "ADC_COMMON")),
             ("STM32H7.*:ADC3_COMMON:.*", ("adccommon", "v4", "ADC_COMMON")),
             (".*:DCMI:.*", ("dcmi", "v1", "DCMI")),
@@ -824,7 +825,7 @@ fn process_core(
                 entry.insert(format!("ADC_COMMON:{}", ip.version.strip_suffix("_Cube").unwrap()));
             }
         }
-        if pname.starts_with("ADC3") && chip_name.starts_with("STM32H7") {
+        if pname.starts_with("ADC3") && (chip_name.starts_with("STM32H7") || chip_name.starts_with("STM32F3")) {
             if let Entry::Vacant(entry) = peri_kinds.entry("ADC3_COMMON".to_string()) {
                 entry.insert(format!("ADC3_COMMON:{}", ip.version.strip_suffix("_Cube").unwrap()));
             }
@@ -1008,17 +1009,6 @@ fn process_core(
             peripherals.push(p);
         }
     }
-    if let Ok(extra_f) = std::fs::read(format!("data/extra/chip_name/{}.yaml", chip_name)) {
-        #[derive(serde::Deserialize)]
-        struct Extra {
-            peripherals: Vec<stm32_data_serde::chip::core::Peripheral>,
-        }
-
-        let extra: Extra = serde_yaml::from_slice(&extra_f).unwrap();
-        for p in extra.peripherals {
-            peripherals.push(p);
-        }
-    }
     peripherals.sort_by_key(|x| x.name.clone());
     let have_peris: HashSet<_> = peripherals.iter_mut().map(|p| p.name.clone()).collect();
     // Collect DMA versions in the chip
diff --git a/stm32-data-gen/src/header.rs b/stm32-data-gen/src/header.rs
index 1427d72..158be9a 100644
--- a/stm32-data-gen/src/header.rs
+++ b/stm32-data-gen/src/header.rs
@@ -165,6 +165,7 @@ impl Defines {
                 "ADC_COMMON",
                 &["ADC_COMMON", "ADC1_COMMON", "ADC12_COMMON", "ADC123_COMMON"],
             ),
+            ("ADC3_COMMON", &["ADC3_COMMON", "ADC4_COMMON", "ADC34_COMMON"]),
             ("CAN", &["CAN_BASE", "CAN1_BASE"]),
             ("FMC", &["FMC_BASE", "FMC_R_BASE"]),
             ("FSMC", &["FSMC_R_BASE"]),