diff --git a/hw/opae/sources.txt b/hw/opae/sources.txt
index 267a752c..2dec7e22 100644
--- a/hw/opae/sources.txt
+++ b/hw/opae/sources.txt
@@ -60,7 +60,7 @@ vortex_afu.json
 ../rtl/interfaces/VX_csr_wb_if.v
 ../rtl/interfaces/VX_gpu_dcache_req_if.v
 ../rtl/interfaces/VX_lsu_req_if.v
-../rtl/interfaces/VX_gpu_snp_req_rsp.v
+../rtl/interfaces/VX_gpu_snp_req_rsp_if.v
 ../rtl/interfaces/VX_mw_wb_if.v
 ../rtl/interfaces/VX_gpr_jal_if.v
 ../rtl/interfaces/VX_gpu_inst_req_if.v
@@ -85,7 +85,7 @@ vortex_afu.json
 ../rtl/cache/VX_mrv_queue.v
 ../rtl/cache/VX_dcache_llv_resp_bank_sel.v
 ../rtl/cache/VX_tag_data_access.v
-../rtl/cache/cache.v
+../rtl/cache/VX_cache.v
 ../rtl/cache/VX_cache_core_req_bank_sel.v
 ../rtl/cache/VX_cache_req_queue.v
 ../rtl/cache/VX_bank.v
diff --git a/hw/opae/vortex_afu.sv b/hw/opae/vortex_afu.sv
index 07ad5ad3..46245fb0 100644
--- a/hw/opae/vortex_afu.sv
+++ b/hw/opae/vortex_afu.sv
@@ -70,7 +70,7 @@ logic        vx_dram_req_read;
 logic        vx_dram_req_write;
 logic [31:0] vx_dram_req_addr;
 logic [31:0] vx_dram_req_data[15:0];
-logic        vx_dram_req_full;
+logic        vx_dram_req_ready;
 
 logic        vx_dram_rsp_ready;
 logic        vx_dram_rsp_valid;
@@ -79,7 +79,7 @@ logic [31:0] vx_dram_rsp_data[15:0];
 
 logic        vx_snp_req;
 logic [31:0] vx_snp_req_addr;
-logic        vx_snp_req_full;
+logic        vx_snp_req_ready;
 
 logic        vx_ebreak;
 
@@ -316,7 +316,7 @@ begin
 
       STATE_RUN, STATE_CLFLUSH: begin
         if (vx_dram_req_read
-         && !vx_dram_req_full) 
+         && vx_dram_req_ready) 
         begin
           avs_address <= (vx_dram_req_addr >> 6);
           avs_read <= 1;
@@ -324,7 +324,7 @@ begin
         end 
         
         if (vx_dram_req_write
-         && !vx_dram_req_full) 
+         && vx_dram_req_ready) 
         begin
           avs_writedata <= {>>{vx_dram_req_data}};
           avs_address <= (vx_dram_req_addr >> 6);