diff --git a/util/fpvgen/bind_fpv.sv.tpl b/util/fpvgen/bind_fpv.sv.tpl
index e2a5af5..d5ffdb4 100644
--- a/util/fpvgen/bind_fpv.sv.tpl
+++ b/util/fpvgen/bind_fpv.sv.tpl
@@ -5,22 +5,37 @@
 
 module ${dut.name}_bind_fpv;
 
-  bind ${dut.name} ${dut.name}_assert_fpv ${dut.name}_assert_fpv (
-    .*
+<% params = dut.get_param_style("parameter") %>
+% if params:
+  bind ${dut.name} ${dut.name}_assert_fpv #(
+% for k, param in enumerate(params):
+  <% comma = "" if (k == len(params)-1) else "," %>  .${param.name}(${param.name})${comma}
+% endfor
+  ) i_${dut.name}_assert_fpv (
+% else:
+  bind ${dut.name} ${dut.name}_assert_fpv i_${dut.name}_assert_fpv (
+%endif
+  % for k, port in enumerate(dut.ports):
+<% comma = "" if (k == len(dut.ports)-1) else "," %>    .${port.name}${comma}
+  % endfor
   );
+
 % if dut.is_cip:
 
   bind ${dut.name} tlul_assert #(
     .EndpointType("Device")
-  ) tlul_assert_device (
+  ) i_tlul_assert_device (
     .clk_i,
     .rst_ni,
     .h2d  (tl_i),
     .d2h  (tl_o)
   );
 
-  bind ${dut.name} ${dut.name}_csr_assert_fpv (
-  	.*
+  bind ${dut.name} ${dut.name}_csr_assert_fpv i_${dut.name}_csr_assert_fpv (
+    .clk_i,
+    .rst_ni,
+    .h2d  (tl_i),
+    .d2h  (tl_o)
   );
 % endif