diff --git a/sv/rtl/misclib/apb_prci.sv b/sv/rtl/misclib/apb_prci.sv
index c1c7a91f..2c1be33d 100644
--- a/sv/rtl/misclib/apb_prci.sv
+++ b/sv/rtl/misclib/apb_prci.sv
@@ -66,7 +66,7 @@ apb_slv #(
 
 always_comb
 begin: comb_proc
-    apb_prci_registers v;
+    apb_prci_rhegisters vh;
     logic [31:0] vb_rdata;
 
     vb_rdata = '0;
diff --git a/sv/rtl/riverlib/cache/lrunway.sv b/sv/rtl/riverlib/cache/lrunway.sv
index ab034a86..c80a1af9 100644
--- a/sv/rtl/riverlib/cache/lrunway.sv
+++ b/sv/rtl/riverlib/cache/lrunway.sv
@@ -46,7 +46,7 @@ lrunway_rxegisters rx, rxin;
 
 always_comb
 begin: comb_proc
-    lrunway_registers v;
+    lrunway_rxegisters vx;
     logic [LINE_WIDTH-1:0] wb_tbl_rdata;
     logic [abits-1:0] vb_tbl_wadr;
     logic [LINE_WIDTH-1:0] vb_tbl_wdata_init;
diff --git a/sv/rtl/riverlib/core/queue.sv b/sv/rtl/riverlib/core/queue.sv
index 183809d4..236a5dce 100644
--- a/sv/rtl/riverlib/core/queue.sv
+++ b/sv/rtl/riverlib/core/queue.sv
@@ -53,6 +53,7 @@ Queue_rxegisters rx, rxin;
 always_comb
 begin: comb_proc
     Queue_registers v;
+    Queue_rxegisters vx;
     logic nempty;
     logic [dbits-1:0] vb_data_o;
     logic full;
diff --git a/sv/rtl/riverlib/core/stacktrbuf.sv b/sv/rtl/riverlib/core/stacktrbuf.sv
index 8bd7c088..4305f9d6 100644
--- a/sv/rtl/riverlib/core/stacktrbuf.sv
+++ b/sv/rtl/riverlib/core/stacktrbuf.sv
@@ -33,7 +33,7 @@ StackTraceBuffer_rxegisters rx, rxin;
 
 always_comb
 begin: comb_proc
-    StackTraceBuffer_registers v;
+    StackTraceBuffer_rxegisters vx;
     vx.raddr = rx.raddr;
     for (int i = 0; i < STACK_TRACE_BUF_SIZE; i++) begin
         vx.stackbuf[i] = rx.stackbuf[i];
diff --git a/sv/rtl/riverlib/dmi/jtagtap.sv b/sv/rtl/riverlib/dmi/jtagtap.sv
index 5cb832a8..0e9cffb2 100644
--- a/sv/rtl/riverlib/dmi/jtagtap.sv
+++ b/sv/rtl/riverlib/dmi/jtagtap.sv
@@ -108,8 +108,8 @@ jtagtap_rhegisters rh, rhin;
 
 always_comb
 begin: comb_proc
-    jtagtap_registers v;
-    jtagtap_nregisters nv;
+    jtagtap_nrhegisters nvh;
+    jtagtap_rhegisters vh;
     logic [drlen-1:0] vb_dr;
     logic v_dmi_req_valid;
     logic v_dmi_req_write;