diff --git a/data/registers/sbs_h5.yaml b/data/registers/syscfg_h5.yaml
similarity index 99%
rename from data/registers/sbs_h5.yaml
rename to data/registers/syscfg_h5.yaml
index 2b9d3f5..3094aeb 100644
--- a/data/registers/sbs_h5.yaml
+++ b/data/registers/syscfg_h5.yaml
@@ -1,4 +1,4 @@
-block/SBS:
+block/SYSCFG:
   description: SBS register block
   items:
   - name: HDPLCR
diff --git a/data/registers/sbs_h50.yaml b/data/registers/syscfg_h50.yaml
similarity index 99%
rename from data/registers/sbs_h50.yaml
rename to data/registers/syscfg_h50.yaml
index 8328357..74107ad 100644
--- a/data/registers/sbs_h50.yaml
+++ b/data/registers/syscfg_h50.yaml
@@ -1,4 +1,4 @@
-block/SBS:
+block/SYSCFG:
   description: System configuration, boot and security
   items:
   - name: HDPLCR
diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs
index 2be4a3e..e7152c9 100644
--- a/stm32-data-gen/src/chips.rs
+++ b/stm32-data-gen/src/chips.rs
@@ -228,8 +228,8 @@ impl PeriMatcher {
             ("STM32WB.*:SYSCFG:.*", ("syscfg", "wb", "SYSCFG")),
             ("STM32WL5.*:SYSCFG:.*", ("syscfg", "wl5", "SYSCFG")),
             ("STM32WLE.*:SYSCFG:.*", ("syscfg", "wle", "SYSCFG")),
-            ("STM32H50.*:SBS:.*", ("sbs", "h50", "SBS")),
-            ("STM32H5.*:SBS:.*", ("sbs", "h5", "SBS")),
+            ("STM32H50.*:SBS:.*", ("syscfg", "h50", "SYSCFG")),
+            ("STM32H5.*:SBS:.*", ("syscfg", "h5", "SYSCFG")),
             (".*:IWDG:iwdg1_v1_1", ("iwdg", "v1", "IWDG")),
             (".*:IWDG:iwdg1_v2_0", ("iwdg", "v2", "IWDG")),
             (".*:WWDG:wwdg1_v1_0", ("wwdg", "v1", "WWDG")),
@@ -946,7 +946,11 @@ fn process_core(
         };
 
         let mut p = stm32_data_serde::chip::core::Peripheral {
-            name: pname.clone(),
+            name: if pname == "SBS" {
+                "SYSCFG".to_string()
+            } else {
+                pname.clone()
+            },
             address: addr,
             registers: None,
             rcc: None,