diff --git a/litex/soc/doc/__init__.py b/litex/soc/doc/__init__.py
index 38c753c54..2a1274bfa 100644
--- a/litex/soc/doc/__init__.py
+++ b/litex/soc/doc/__init__.py
@@ -70,7 +70,7 @@ def generate_docs(soc, base_dir, project_name="LiteX SoC Project",
 
     # Gather all interrupts so we can easily map IRQ numbers to CSR sections
     interrupts = {}
-    for csr, irq in sorted(soc.soc_interrupt_map.items()):
+    for csr, irq in sorted(soc.irq.locs.items()):
         interrupts[csr] = irq
 
     # Convert each CSR region into a DocumentedCSRRegion.
diff --git a/litex/soc/integration/export.py b/litex/soc/integration/export.py
index c91f53524..89c516ab3 100644
--- a/litex/soc/integration/export.py
+++ b/litex/soc/integration/export.py
@@ -333,7 +333,7 @@ def get_svd(soc, vendor="litex", name="soc", description=None):
         svd.append('                </register>')
 
     interrupts = {}
-    for csr, irq in sorted(soc.soc_interrupt_map.items()):
+    for csr, irq in sorted(soc.irq.locs.items()):
         interrupts[csr] = irq
 
     documented_regions = []