diff --git a/examples/arty.yml b/examples/arty.yml
index 1117f4e..beb981e 100644
--- a/examples/arty.yml
+++ b/examples/arty.yml
@@ -34,5 +34,6 @@
     "user_ports_id_width": 32,    # AXI identifier width
 
     # CSR Port -----------------------------------------------------------------
-    "expose_csr_port": "no", # expose access to CSR (I/O) ports
+    "csr_expose": "no", # Expose CSR bus as I/Os
+    "csr_align" : 32,   # CSR alignment
 }
diff --git a/examples/genesys2.yml b/examples/genesys2.yml
index 1386296..fb6338d 100644
--- a/examples/genesys2.yml
+++ b/examples/genesys2.yml
@@ -34,5 +34,6 @@
     "user_ports_id_width": 32,    # AXI identifier width
 
     # CSR Port -----------------------------------------------------------------
-    "expose_csr_port": "no", # expose access to CSR (I/O) ports
+    "csr_expose": "no", # Expose CSR bus as I/Os
+    "csr_align" : 32,   # CSR alignment
 }
diff --git a/examples/nexys4ddr.yml b/examples/nexys4ddr.yml
index 2b6cc4b..5241e1c 100644
--- a/examples/nexys4ddr.yml
+++ b/examples/nexys4ddr.yml
@@ -29,5 +29,6 @@
     "user_ports_id_width": 32,    # AXI identifier width
 
     # CSR Port -----------------------------------------------------------------
-    "expose_csr_port": "no", # expose access to CSR (I/O) ports
+    "csr_expose": "no", # Expose CSR bus as I/Os
+    "csr_align" : 32,   # CSR alignment
 }
diff --git a/litedram/gen.py b/litedram/gen.py
index 22e5e76..69466f1 100644
--- a/litedram/gen.py
+++ b/litedram/gen.py
@@ -248,7 +248,7 @@ class LiteDRAMCore(SoCSDRAM):
     def __init__(self, platform, core_config, **kwargs):
         platform.add_extension(get_common_ios())
         sys_clk_freq = core_config["sys_clk_freq"]
-        csr_align = core_config.get("csr_port_align", 32)
+        csr_align = core_config.get("csr_align", 32)
         SoCSDRAM.__init__(self, platform, sys_clk_freq,
             cpu_type=core_config["cpu"],
             l2_size=16*core_config["sdram_module_nb"],
@@ -291,7 +291,7 @@ class LiteDRAMCore(SoCSDRAM):
         ]
 
         # CSR port
-        if core_config.get("expose_csr_port", "no") == "yes":
+        if core_config.get("csr_expose", "no") == "yes":
             csr_port = csr_bus.Interface(
                 address_width=self.csr_address_width,
                 data_width=self.csr_data_width)