diff --git a/hw/rtl/VX_core_wrapper.sv b/hw/rtl/VX_core_wrapper.sv
index 7fe67c7d..32b90bfc 100644
--- a/hw/rtl/VX_core_wrapper.sv
+++ b/hw/rtl/VX_core_wrapper.sv
@@ -39,39 +39,39 @@ module Vortex import VX_gpu_pkg::*; #(
 
     // dmem ------------------------------------------------
 
-    input  [NUM_THREADS - 1:0]                           dmem_d_valid,
-    input  [(NUM_THREADS * 3) - 1:0]                     dmem_d_bits_opcode,
-    input  [(NUM_THREADS * 4) - 1:0]                     dmem_d_bits_size,
-    input  [(NUM_THREADS * DCACHE_NOSM_TAG_WIDTH) - 1:0] dmem_d_bits_source,
-    input  [(NUM_THREADS * 32) - 1:0]                    dmem_d_bits_data,
-    output [NUM_THREADS - 1:0]                           dmem_d_ready,
+    input  [DCACHE_NUM_REQS - 1:0]                           dmem_d_valid,
+    input  [(DCACHE_NUM_REQS * 3) - 1:0]                     dmem_d_bits_opcode,
+    input  [(DCACHE_NUM_REQS * 4) - 1:0]                     dmem_d_bits_size,
+    input  [(DCACHE_NUM_REQS * DCACHE_NOSM_TAG_WIDTH) - 1:0] dmem_d_bits_source,
+    input  [(DCACHE_NUM_REQS * 32) - 1:0]                    dmem_d_bits_data,
+    output [DCACHE_NUM_REQS - 1:0]                           dmem_d_ready,
 
-    input  [NUM_THREADS - 1:0]                           dmem_a_ready,
-    output [NUM_THREADS - 1:0]                           dmem_a_valid,
-    output [(NUM_THREADS * 3) - 1:0]                     dmem_a_bits_opcode,
-    output [(NUM_THREADS * 4) - 1:0]                     dmem_a_bits_size,
-    output [(NUM_THREADS * DCACHE_NOSM_TAG_WIDTH) - 1:0] dmem_a_bits_source,
-    output [(NUM_THREADS * 32) - 1:0]                    dmem_a_bits_address,
-    output [(NUM_THREADS * 4) - 1:0]                     dmem_a_bits_mask,
-    output [(NUM_THREADS * 32) - 1:0]                    dmem_a_bits_data,
+    input  [DCACHE_NUM_REQS - 1:0]                           dmem_a_ready,
+    output [DCACHE_NUM_REQS - 1:0]                           dmem_a_valid,
+    output [(DCACHE_NUM_REQS * 3) - 1:0]                     dmem_a_bits_opcode,
+    output [(DCACHE_NUM_REQS * 4) - 1:0]                     dmem_a_bits_size,
+    output [(DCACHE_NUM_REQS * DCACHE_NOSM_TAG_WIDTH) - 1:0] dmem_a_bits_source,
+    output [(DCACHE_NUM_REQS * 32) - 1:0]                    dmem_a_bits_address,
+    output [(DCACHE_NUM_REQS * 4) - 1:0]                     dmem_a_bits_mask,
+    output [(DCACHE_NUM_REQS * 32) - 1:0]                    dmem_a_bits_data,
 
     // smem ------------------------------------------------
 
-    input  [NUM_THREADS - 1:0]                           smem_d_valid,
-    input  [(NUM_THREADS * 3) - 1:0]                     smem_d_bits_opcode,
-    input  [(NUM_THREADS * 4) - 1:0]                     smem_d_bits_size,
-    input  [(NUM_THREADS * DCACHE_NOSM_TAG_WIDTH) - 1:0] smem_d_bits_source,
-    input  [(NUM_THREADS * 32) - 1:0]                    smem_d_bits_data,
-    output [NUM_THREADS - 1:0]                           smem_d_ready,
+    input  [DCACHE_NUM_REQS - 1:0]                           smem_d_valid,
+    input  [(DCACHE_NUM_REQS * 3) - 1:0]                     smem_d_bits_opcode,
+    input  [(DCACHE_NUM_REQS * 4) - 1:0]                     smem_d_bits_size,
+    input  [(DCACHE_NUM_REQS * DCACHE_NOSM_TAG_WIDTH) - 1:0] smem_d_bits_source,
+    input  [(DCACHE_NUM_REQS * 32) - 1:0]                    smem_d_bits_data,
+    output [DCACHE_NUM_REQS - 1:0]                           smem_d_ready,
 
-    input  [NUM_THREADS - 1:0]                           smem_a_ready,
-    output [NUM_THREADS - 1:0]                           smem_a_valid,
-    output [(NUM_THREADS * 3) - 1:0]                     smem_a_bits_opcode,
-    output [(NUM_THREADS * 4) - 1:0]                     smem_a_bits_size,
-    output [(NUM_THREADS * DCACHE_NOSM_TAG_WIDTH) - 1:0] smem_a_bits_source,
-    output [(NUM_THREADS * 32) - 1:0]                    smem_a_bits_address,
-    output [(NUM_THREADS * 4) - 1:0]                     smem_a_bits_mask,
-    output [(NUM_THREADS * 32) - 1:0]                    smem_a_bits_data,
+    input  [DCACHE_NUM_REQS - 1:0]                           smem_a_ready,
+    output [DCACHE_NUM_REQS - 1:0]                           smem_a_valid,
+    output [(DCACHE_NUM_REQS * 3) - 1:0]                     smem_a_bits_opcode,
+    output [(DCACHE_NUM_REQS * 4) - 1:0]                     smem_a_bits_size,
+    output [(DCACHE_NUM_REQS * DCACHE_NOSM_TAG_WIDTH) - 1:0] smem_a_bits_source,
+    output [(DCACHE_NUM_REQS * 32) - 1:0]                    smem_a_bits_address,
+    output [(DCACHE_NUM_REQS * 4) - 1:0]                     smem_a_bits_mask,
+    output [(DCACHE_NUM_REQS * 32) - 1:0]                    smem_a_bits_data,
 
     // input         fpu_fcsr_flags_valid,
     // input  [4:0]  fpu_fcsr_flags_bits,