diff --git a/sim/imperas.ic b/sim/imperas.ic
index d561b22f2..ad19aaf68 100644
--- a/sim/imperas.ic
+++ b/sim/imperas.ic
@@ -1,7 +1,7 @@
 #--mpdconsole
 #--gdbconsole
---showoverrides
---showcommands
+#--showoverrides
+#--showcommands
 
 # Core settings
 --override cpu/priv_version=1.12 
diff --git a/sim/wally-imperas-cov.do b/sim/wally-imperas-cov.do
index e39d9ef38..2309b01df 100644
--- a/sim/wally-imperas-cov.do
+++ b/sim/wally-imperas-cov.do
@@ -29,19 +29,19 @@ vlog +incdir+../config/$1 \
      +define+USE_IMPERAS_DV \
      +incdir+$env(IMPERAS_HOME)/ImpPublic/include/host \
      +incdir+$env(IMPERAS_HOME)/ImpProprietary/include/host \
-     $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvvi-api-pkg.sv    \
-     $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvvi-trace.sv      \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/rvvi-pkg.sv   \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/imperasDV-api-pkg.sv \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2api.sv  \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2log.sv  \
+     $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviApiPkg.sv    \
+     $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviTrace.sv      \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvPkg.sv   \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvApiPkg.sv \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2api.sv  \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2log.sv  \
      \
      +define+INCLUDE_TRACE2COV +define+COVER_BASE_RV64I +define+COVER_LEVEL_DV_PR_EXT \
        +define+COVER_RV64I \
        +define+COVER_RV64C \
        +define+COVER_RV64M \
      +incdir+$env(IMPERAS_HOME)/ImpProprietary/source/host/riscvISACOV/source \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2cov.sv  \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2cov.sv  \
     \
     ../src/cvw.sv \
      ../testbench/testbench_imperas.sv \
diff --git a/sim/wally-imperas-no-idv.do b/sim/wally-imperas-no-idv.do
index bd07daee1..47d8bf07b 100644
--- a/sim/wally-imperas-no-idv.do
+++ b/sim/wally-imperas-no-idv.do
@@ -26,7 +26,7 @@ vlib work
         # *** modelsim won't take `PA_BITS, but will take other defines for the lengths of DTIM_RANGE and IROM_LEN.  For now just live with the warnings.
 vlog +incdir+../config/$1 \
      +incdir+../config/shared \
-     ../../external/ImperasDV-HMC/Imperas/ImpPublic/source/host/rvvi/rvvi-trace.sv \
+     ../../external/ImperasDV-HMC/Imperas/ImpPublic/source/host/rvvi/rvviTrace.sv \
      ../src/cvw.sv \
      ../testbench/testbench_imperas.sv \
      ../testbench/common/*.sv   \
diff --git a/sim/wally-imperas.do b/sim/wally-imperas.do
index 1120b8099..7f0b060e2 100644
--- a/sim/wally-imperas.do
+++ b/sim/wally-imperas.do
@@ -30,13 +30,13 @@ vlog +incdir+../config/$1 \
      +define+USE_IMPERAS_DV \
      +incdir+$env(IMPERAS_HOME)/ImpPublic/include/host \
      +incdir+$env(IMPERAS_HOME)/ImpProprietary/include/host \
-     $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvvi-api-pkg.sv    \
-     $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvvi-trace.sv      \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/rvvi-pkg.sv   \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/imperasDV-api-pkg.sv \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2api.sv  \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2log.sv  \
-     $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2cov.sv  \
+     $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviApiPkg.sv    \
+     $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviTrace.sv      \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvPkg.sv   \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvApiPkg.sv \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2api.sv  \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2log.sv  \
+     $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2cov.sv  \
      ../src/cvw.sv \
      ../testbench/testbench_imperas.sv \
      ../testbench/common/*.sv   \
diff --git a/sim/wally-linux-imperas.do b/sim/wally-linux-imperas.do
index 523d31a64..fcf6ceec4 100644
--- a/sim/wally-linux-imperas.do
+++ b/sim/wally-linux-imperas.do
@@ -53,13 +53,13 @@ if {$2 eq "buildroot" || $2 eq "buildroot-checkpoint"} {
       +incdir+../config/shared \
       +incdir+$env(IMPERAS_HOME)/ImpPublic/include/host \
       +incdir+$env(IMPERAS_HOME)/ImpProprietary/include/host \
-      $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvvi-api-pkg.sv    \
-      $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvvi-trace.sv      \
-      $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/rvvi-pkg.sv   \
-      $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/imperasDV-api-pkg.sv \
-      $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2api.sv  \
-      $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2log.sv  \
-      $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2cov.sv  \
+      $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviApiPkg.sv    \
+      $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviTrace.sv      \
+      $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvPkg.sv   \
+      $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvApiPkg.sv \
+      $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2api.sv  \
+      $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2log.sv  \
+      $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2cov.sv  \
       ../src/cvw.sv \
        ../testbench/testbench-linux-imperas.sv \
        ../testbench/common/*.sv ../src/*/*.sv \
diff --git a/testbench/testbench-linux-imperas.sv b/testbench/testbench-linux-imperas.sv
index 223e3529b..79b354cb0 100644
--- a/testbench/testbench-linux-imperas.sv
+++ b/testbench/testbench-linux-imperas.sv
@@ -30,7 +30,7 @@
 // `define USE_IMPERAS_DV
 
 `ifdef USE_IMPERAS_DV
-  `include "rvvi/imperasDV.svh"
+    `include "idv/idv.svh"
 `endif
 
 `define DEBUG_TRACE 0
@@ -55,7 +55,7 @@ module testbench;
 
 
   `ifdef USE_IMPERAS_DV
-    import rvviPkg::*;
+    import idvPkg::*;
     import rvviApiPkg::*;
     import idvApiPkg::*;
   `endif
@@ -302,7 +302,7 @@ module testbench;
       initial begin
         int iter;
         #1;
-        MAX_ERRS = 3;
+        IDV_MAX_ERRS = 3;
 
         // Initialize REF (do this before initializing the DUT)
         if (!rvviVersionCheck(RVVI_API_VERSION)) begin
diff --git a/testbench/testbench_imperas.sv b/testbench/testbench_imperas.sv
index 7aea61903..0ca45420a 100644
--- a/testbench/testbench_imperas.sv
+++ b/testbench/testbench_imperas.sv
@@ -32,7 +32,7 @@
 // `define USE_IMPERAS_DV
 
 `ifdef USE_IMPERAS_DV
-  `include "rvvi/imperasDV.svh"
+  `include "idv/idv.svh"
 `endif
 
 import cvw::*;
@@ -41,7 +41,7 @@ module testbench;
   parameter DEBUG=0;
 
 `ifdef USE_IMPERAS_DV
-  import rvviPkg::*;
+  import idvPkg::*;
   import rvviApiPkg::*;
   import idvApiPkg::*;
 `endif
@@ -145,7 +145,7 @@ module testbench;
 
     initial begin 
       
-      MAX_ERRS = 3;
+      IDV_MAX_ERRS = 3;
 
       // Initialize REF (do this before initializing the DUT)
       if (!rvviVersionCheck(RVVI_API_VERSION)) begin