diff --git a/hdl/top_combpm_electron.vhd b/hdl/top_combpm_electron.vhd
index d98db696d8be5dbfa2f1f99b2ad8938ce7216d33..d88202ca830feb05a09752bf0d3cbcf9f2253a58 100644
--- a/hdl/top_combpm_electron.vhd
+++ b/hdl/top_combpm_electron.vhd
@@ -54,8 +54,8 @@ entity top_combpm_electron is
 
         -- AXI bus interface
         s_axi_aclk  : in std_logic;
-        pi_s_top  : in  t_combpm_m2s;
-        po_s_top  : out t_combpm_s2m
+        s_axi_m2s : in  t_combpm_m2s;
+        s_axi_s2m : out t_combpm_s2m
     );
 end top_combpm_electron;
 
@@ -144,8 +144,8 @@ begin
         port map(
             pi_clock    => s_axi_aclk,
             pi_reset    => sync_reset,
-            pi_s_top    => pi_s_top,
-            po_s_top    => po_s_top,
+            pi_s_top    => s_axi_m2s,
+            po_s_top    => s_axi_s2m,
             pi_addrmap  => addrmap_w,
             po_addrmap  => addrmap_r
         );