diff --git a/hw/ip/snitch_cluster/src/snitch_cluster.sv b/hw/ip/snitch_cluster/src/snitch_cluster.sv
index 0380bb0d66..c4f49bec80 100644
--- a/hw/ip/snitch_cluster/src/snitch_cluster.sv
+++ b/hw/ip/snitch_cluster/src/snitch_cluster.sv
@@ -641,7 +641,7 @@ module snitch_cluster
         .ByteWidth (8),
         .NumPorts (1),
         .Latency (1),
-        .impl_in_t (sram_cfg_t),
+        .impl_in_t (sram_cfg_t)
       ) i_data_mem (
         .clk_i,
         .rst_ni,
diff --git a/hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl b/hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl
index 36189daa35..5017e04a1b 100644
--- a/hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl
+++ b/hw/ip/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl
@@ -169,7 +169,7 @@ module ${cfg['name']}_wrapper (
   input  logic                                   clk_d2_bypass_i,
 % endif
 % if cfg['sram_cfg_expose']:
-  input  sram_cfgs_t                             sram_cfgs_i,
+  input  ${cfg['pkg_name']}::sram_cfgs_t         sram_cfgs_i,
 %endif
   input  ${cfg['pkg_name']}::narrow_in_req_t     narrow_in_req_i,
   output ${cfg['pkg_name']}::narrow_in_resp_t    narrow_in_resp_o,
diff --git a/hw/system/occamy/src/occamy_cluster_wrapper.sv b/hw/system/occamy/src/occamy_cluster_wrapper.sv
index 6377453209..742cccba7b 100644
--- a/hw/system/occamy/src/occamy_cluster_wrapper.sv
+++ b/hw/system/occamy/src/occamy_cluster_wrapper.sv
@@ -337,7 +337,7 @@ module occamy_cluster_wrapper (
   input  logic [9:0]                             hart_base_id_i,
   input  logic [47:0]                            cluster_base_addr_i,
   input  logic                                   clk_d2_bypass_i,
-  input  sram_cfgs_t                             sram_cfgs_i,
+  input  occamy_cluster_pkg::sram_cfgs_t         sram_cfgs_i,
   input  occamy_cluster_pkg::narrow_in_req_t     narrow_in_req_i,
   output occamy_cluster_pkg::narrow_in_resp_t    narrow_in_resp_o,
   output occamy_cluster_pkg::narrow_out_req_t    narrow_out_req_o,
diff --git a/hw/system/occamy/src/occamy_pkg.sv b/hw/system/occamy/src/occamy_pkg.sv
index d0efd7f2ef..4caba09523 100644
--- a/hw/system/occamy/src/occamy_pkg.sv
+++ b/hw/system/occamy/src/occamy_pkg.sv
@@ -42,8 +42,8 @@ package occamy_pkg;
 
   typedef struct packed {
     sram_cfg_t spm;
-    sram_cfg_cva6 cva6;
-    sram_cfg_quadrant quadrant;
+    sram_cfg_cva6_t cva6;
+    sram_cfg_quadrant_t quadrant;
   } sram_cfgs_t;
 
   localparam int unsigned SramCfgWidth = $bits(sram_cfg_t);
diff --git a/hw/system/occamy/src/occamy_pkg.sv.tpl b/hw/system/occamy/src/occamy_pkg.sv.tpl
index 0c48b4984f..8aeb588a8f 100644
--- a/hw/system/occamy/src/occamy_pkg.sv.tpl
+++ b/hw/system/occamy/src/occamy_pkg.sv.tpl
@@ -42,8 +42,8 @@ package occamy_pkg;
 
   typedef struct packed {
     sram_cfg_t spm;
-    sram_cfg_cva6 cva6;
-    sram_cfg_quadrant quadrant;
+    sram_cfg_cva6_t cva6;
+    sram_cfg_quadrant_t quadrant;
   } sram_cfgs_t;
 
   localparam int unsigned SramCfgWidth = $bits(sram_cfg_t);