diff --git a/hdl/top_combpm_electron.vhd b/hdl/top_combpm_electron.vhd
index b8fabe478686601a5b9865287d55c7fdc446fe65..83b9a7cdf6cabd2ff87402720fe64fef1ef425e1 100644
--- a/hdl/top_combpm_electron.vhd
+++ b/hdl/top_combpm_electron.vhd
@@ -348,12 +348,12 @@ begin
         m_axis_tvalid => m_axis_tvalid,
 
         -- Table configuration interface
-        pi_table_en     => addrmap_r.table.en,
-        pi_table_we     => addrmap_r.table.we,
-        pi_table_addr   => addrmap_r.table.addr(C_W_ADDR_TABLE-1 downto 0),
-        pi_table_data   => addrmap_r.table.data,
-        po_table_data   => addrmap_w.table.data
+        pi_table_en     => addrmap_r.filtertable.en,
+        pi_table_we     => addrmap_r.filtertable.we,
+        pi_table_addr   => addrmap_r.filtertable.addr(C_W_ADDR_TABLE-1 downto 0),
+        pi_table_data   => addrmap_r.filtertable.data(7 downto 0),
+        po_table_data   => addrmap_w.filtertable.data(7 downto 0)
    );
-
+   addrmap_w.filtertable.data(31 downto 8) <= (others => '0');
 
 end architecture struct;
diff --git a/rdl/combpm.rdl b/rdl/combpm.rdl
index dfd1052fdc13a5ade159c6cacf7df4d53f75badd..4cd1004716e75cf66ba7c7738aca110489bcc6fc 100644
--- a/rdl/combpm.rdl
+++ b/rdl/combpm.rdl
@@ -116,8 +116,8 @@ addrmap combpm {
 
     external mem {
         desc = "BPM filter table";
-        memwidth = 8;
+        memwidth = 32;
         mementries = 2**`C_W_ADDR_TABLE;
-    } TABLE @0x200;
+    } FILTERTABLE;
 
 };