diff --git a/data/registers/opamp_h7.yaml b/data/registers/opamp_h_v1.yaml
similarity index 100%
rename from data/registers/opamp_h7.yaml
rename to data/registers/opamp_h_v1.yaml
diff --git a/data/registers/opamp_h5.yaml b/data/registers/opamp_h_v2.yaml
similarity index 100%
rename from data/registers/opamp_h5.yaml
rename to data/registers/opamp_h_v2.yaml
diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs
index bceeda6..e2195bc 100644
--- a/stm32-data-gen/src/chips.rs
+++ b/stm32-data-gen/src/chips.rs
@@ -226,8 +226,8 @@ impl PeriMatcher {
             ("STM32H7.*:ADC3_COMMON:.*", ("adccommon", "v4", "ADC_COMMON")),
             ("STM32G4.*:OPAMP:G4_tsmc90_fastOpamp", ("opamp", "g4", "OPAMP")),
             ("STM32F3.*:OPAMP:tsmc018_ull_opamp_v1_0", ("opamp", "f3", "OPAMP")),
-            ("STM32H7.*:OPAMP:.*", ("opamp", "h7", "OPAMP")),
-            ("STM32H5.*:OPAMP:.*", ("opamp", "h5", "OPAMP")),
+            ("STM32H7.*:OPAMP:.*", ("opamp", "h_v1", "OPAMP")),
+            ("STM32H5.*:OPAMP:.*", ("opamp", "h_v2", "OPAMP")),
             (".*:DCMI:.*", ("dcmi", "v1", "DCMI")),
             ("STM32C0.*:SYSCFG:.*", ("syscfg", "c0", "SYSCFG")),
             ("STM32F0.*:SYSCFG:.*", ("syscfg", "f0", "SYSCFG")),