diff --git a/test_regress/t/t_clk_inp_init.cpp b/test_regress/t/t_clk_inp_init.cpp
index c80c819a3..6afcc98ce 100644
--- a/test_regress/t/t_clk_inp_init.cpp
+++ b/test_regress/t/t_clk_inp_init.cpp
@@ -24,7 +24,7 @@ void oneTest(int argc, char** argv, int seed) {
     contextp->randReset(123);
 
     // Construct the Verilated model, from Vtop.h generated from Verilating
-    const std::unique_ptr<Vt_clk_inp_init> topp{new Vt_clk_inp_init{contextp.get()}};
+    const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{contextp.get()}};
 
     // Start not in reset
     topp->rst_n = 1;
diff --git a/test_regress/t/t_comb_input_0.cpp b/test_regress/t/t_comb_input_0.cpp
index 068210940..b08087648 100644
--- a/test_regress/t/t_comb_input_0.cpp
+++ b/test_regress/t/t_comb_input_0.cpp
@@ -22,7 +22,7 @@ int main(int argc, char** argv) {
     contextp->commandArgs(argc, argv);
     srand48(5);
 
-    const std::unique_ptr<Vt_comb_input_0> topp{new Vt_comb_input_0};
+    const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX};
     topp->inc = 1;
     topp->clk = false;
     topp->eval();
diff --git a/test_regress/t/t_comb_input_1.cpp b/test_regress/t/t_comb_input_1.cpp
index b97948dad..62acf8373 100644
--- a/test_regress/t/t_comb_input_1.cpp
+++ b/test_regress/t/t_comb_input_1.cpp
@@ -22,7 +22,7 @@ int main(int argc, char** argv) {
     contextp->commandArgs(argc, argv);
     srand48(5);
 
-    const std::unique_ptr<Vt_comb_input_1> topp{new Vt_comb_input_1};
+    const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX};
     topp->inc = 1;
     topp->clk = false;
     topp->eval();
diff --git a/test_regress/t/t_comb_input_2.cpp b/test_regress/t/t_comb_input_2.cpp
index 9d2aad472..0f3534650 100644
--- a/test_regress/t/t_comb_input_2.cpp
+++ b/test_regress/t/t_comb_input_2.cpp
@@ -22,7 +22,7 @@ int main(int argc, char** argv) {
     contextp->commandArgs(argc, argv);
     srand48(5);
 
-    const std::unique_ptr<Vt_comb_input_2> topp{new Vt_comb_input_2};
+    const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX};
     topp->inc = 1;
     topp->clk = false;
     topp->eval();
diff --git a/test_regress/t/t_const_bitoptree_bug3096.cpp b/test_regress/t/t_const_bitoptree_bug3096.cpp
index deb9e1ee9..8c3dc8625 100644
--- a/test_regress/t/t_const_bitoptree_bug3096.cpp
+++ b/test_regress/t/t_const_bitoptree_bug3096.cpp
@@ -14,7 +14,7 @@
 #include <iostream>
 
 int main(int argc, char* argv[]) {
-    Vt_const_bitoptree_bug3096* const tb = new Vt_const_bitoptree_bug3096;
+    VM_PREFIX* const tb = new VM_PREFIX;
 
     tb->instr_i = 0x08c0006f;
     tb->eval();
diff --git a/test_regress/t/t_enum_public.cpp b/test_regress/t/t_enum_public.cpp
index 7bd7c99d5..8dd9f8931 100644
--- a/test_regress/t/t_enum_public.cpp
+++ b/test_regress/t/t_enum_public.cpp
@@ -18,7 +18,7 @@ int main(int argc, char* argv[]) {
     Verilated::debug(0);
     Verilated::commandArgs(argc, argv);
 
-    Vt_enum_public* topp = new Vt_enum_public;
+    VM_PREFIX* topp = new VM_PREFIX;
 
     // Make sure public tag worked
     if (Vt_enum_public_p3::ZERO == Vt_enum_public_p3::ONE) {}
diff --git a/test_regress/t/t_func_rand.cpp b/test_regress/t/t_func_rand.cpp
index fdfaba95e..772dd9fee 100644
--- a/test_regress/t/t_func_rand.cpp
+++ b/test_regress/t/t_func_rand.cpp
@@ -16,7 +16,7 @@ int main(int argc, char* argv[]) {
     Verilated::debug(0);
     Verilated::commandArgs(argc, argv);
 
-    Vt_func_rand* topp = new Vt_func_rand;
+    VM_PREFIX* topp = new VM_PREFIX;
 
     printf("\nTesting\n");
     for (int i = 0; i < 10; i++) {
diff --git a/test_regress/t/t_gantt_two.cpp b/test_regress/t/t_gantt_two.cpp
index 7b1375126..9bea82889 100644
--- a/test_regress/t/t_gantt_two.cpp
+++ b/test_regress/t/t_gantt_two.cpp
@@ -21,8 +21,8 @@ int main(int argc, char** argv) {
     contextp->debug(0);
     contextp->commandArgs(argc, argv);
 
-    std::unique_ptr<Vt_gantt_two> topap{new Vt_gantt_two{contextp.get(), "topa"}};
-    std::unique_ptr<Vt_gantt_two> topbp{new Vt_gantt_two{contextp.get(), "topb"}};
+    std::unique_ptr<VM_PREFIX> topap{new VM_PREFIX{contextp.get(), "topa"}};
+    std::unique_ptr<VM_PREFIX> topbp{new VM_PREFIX{contextp.get(), "topb"}};
 
     topap->clk = false;
     topap->eval();
diff --git a/test_regress/t/t_math_imm2.cpp b/test_regress/t/t_math_imm2.cpp
index b4c8015a0..3b2183cba 100644
--- a/test_regress/t/t_math_imm2.cpp
+++ b/test_regress/t/t_math_imm2.cpp
@@ -19,7 +19,7 @@ int main(int argc, char* argv[]) {
     Verilated::debug(0);
     Verilated::commandArgs(argc, argv);
 
-    Vt_math_imm2* sim = new Vt_math_imm2;
+    VM_PREFIX* sim = new VM_PREFIX;
     int lbit, hbit;
 
     int errs = 0;
diff --git a/test_regress/t/t_mem_slot.cpp b/test_regress/t/t_mem_slot.cpp
index a65ae687d..dfaee4052 100644
--- a/test_regress/t/t_mem_slot.cpp
+++ b/test_regress/t/t_mem_slot.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[]) {
     Verilated::debug(0);
     Verilated::commandArgs(argc, argv);
 
-    Vt_mem_slot* sim = new Vt_mem_slot;
+    VM_PREFIX* sim = new VM_PREFIX;
     int slot, bit, i;
 
     // clear all bits in the array
diff --git a/test_regress/t/t_multitop_sig.cpp b/test_regress/t/t_multitop_sig.cpp
index 29a01491b..b9bb8cfb0 100644
--- a/test_regress/t/t_multitop_sig.cpp
+++ b/test_regress/t/t_multitop_sig.cpp
@@ -23,7 +23,7 @@ int main(int argc, char* argv[]) {
     Verilated::debug(0);
     Verilated::commandArgs(argc, argv);
 
-    Vt_multitop_sig* topp = new Vt_multitop_sig{""};
+    VM_PREFIX* topp = new VM_PREFIX{""};
 
     {
         topp->a__02Ein = 0;
diff --git a/test_regress/t/t_order_dpi_export_1.cpp b/test_regress/t/t_order_dpi_export_1.cpp
index 7a261f661..2902ae32f 100644
--- a/test_regress/t/t_order_dpi_export_1.cpp
+++ b/test_regress/t/t_order_dpi_export_1.cpp
@@ -14,7 +14,7 @@
 #include <svdpi.h>
 
 int main(int argc, char* argv[]) {
-    Vt_order_dpi_export_1* const tb = new Vt_order_dpi_export_1;
+    VM_PREFIX* const tb = new VM_PREFIX;
     tb->contextp()->commandArgs(argc, argv);
     bool clk = true;
 
diff --git a/test_regress/t/t_order_dpi_export_2.cpp b/test_regress/t/t_order_dpi_export_2.cpp
index fb134ddeb..ca68903cd 100644
--- a/test_regress/t/t_order_dpi_export_2.cpp
+++ b/test_regress/t/t_order_dpi_export_2.cpp
@@ -16,7 +16,7 @@
 void toggle_other_clk(svBit val) { set_other_clk(val); }
 
 int main(int argc, char* argv[]) {
-    Vt_order_dpi_export_2* const tb = new Vt_order_dpi_export_2;
+    VM_PREFIX* const tb = new VM_PREFIX;
     tb->contextp()->commandArgs(argc, argv);
     bool clk = true;
 
diff --git a/test_regress/t/t_order_dpi_export_3.cpp b/test_regress/t/t_order_dpi_export_3.cpp
index c8a5fcb25..46087bafe 100644
--- a/test_regress/t/t_order_dpi_export_3.cpp
+++ b/test_regress/t/t_order_dpi_export_3.cpp
@@ -18,7 +18,7 @@ void toggle_other_clk(svBit val) { set_other_clk(val); }
 void toggle_third_clk(svBit val) { set_third_clk(val); }
 
 int main(int argc, char* argv[]) {
-    Vt_order_dpi_export_3* const tb = new Vt_order_dpi_export_3;
+    VM_PREFIX* const tb = new VM_PREFIX;
     tb->contextp()->commandArgs(argc, argv);
     bool clk = true;
 
diff --git a/test_regress/t/t_order_dpi_export_4.cpp b/test_regress/t/t_order_dpi_export_4.cpp
index 95c169f47..370bdb1c5 100644
--- a/test_regress/t/t_order_dpi_export_4.cpp
+++ b/test_regress/t/t_order_dpi_export_4.cpp
@@ -18,7 +18,7 @@ void toggle_other_clk(svBit val) { set_other_clk(val); }
 void toggle_third_clk(svBit val) { set_third_clk(val); }
 
 int main(int argc, char* argv[]) {
-    Vt_order_dpi_export_4* const tb = new Vt_order_dpi_export_4;
+    VM_PREFIX* const tb = new VM_PREFIX;
     tb->contextp()->commandArgs(argc, argv);
     bool clk = true;
 
diff --git a/test_regress/t/t_order_dpi_export_5.cpp b/test_regress/t/t_order_dpi_export_5.cpp
index 494b161a8..e043b2bd0 100644
--- a/test_regress/t/t_order_dpi_export_5.cpp
+++ b/test_regress/t/t_order_dpi_export_5.cpp
@@ -14,7 +14,7 @@
 #include <svdpi.h>
 
 int main(int argc, char* argv[]) {
-    Vt_order_dpi_export_5* const tb = new Vt_order_dpi_export_5;
+    VM_PREFIX* const tb = new VM_PREFIX;
     tb->contextp()->commandArgs(argc, argv);
     bool clk = true;
 
diff --git a/test_regress/t/t_order_dpi_export_6.cpp b/test_regress/t/t_order_dpi_export_6.cpp
index 95fceb8ef..048447f2c 100644
--- a/test_regress/t/t_order_dpi_export_6.cpp
+++ b/test_regress/t/t_order_dpi_export_6.cpp
@@ -16,7 +16,7 @@
 void toggle_other_clk(svBit val) { set_other_clk(val); }
 
 int main(int argc, char* argv[]) {
-    Vt_order_dpi_export_6* const tb = new Vt_order_dpi_export_6;
+    VM_PREFIX* const tb = new VM_PREFIX;
     tb->contextp()->commandArgs(argc, argv);
     bool clk = true;
 
diff --git a/test_regress/t/t_order_dpi_export_7.cpp b/test_regress/t/t_order_dpi_export_7.cpp
index 6034549d4..0649d2e97 100644
--- a/test_regress/t/t_order_dpi_export_7.cpp
+++ b/test_regress/t/t_order_dpi_export_7.cpp
@@ -14,7 +14,7 @@
 #include <svdpi.h>
 
 int main(int argc, char* argv[]) {
-    Vt_order_dpi_export_7* const tb = new Vt_order_dpi_export_7;
+    VM_PREFIX* const tb = new VM_PREFIX;
     tb->contextp()->commandArgs(argc, argv);
     bool clk = true;
 
diff --git a/test_regress/t/t_param_public.cpp b/test_regress/t/t_param_public.cpp
index 17cc1c0f6..6bed53bd0 100644
--- a/test_regress/t/t_param_public.cpp
+++ b/test_regress/t/t_param_public.cpp
@@ -18,7 +18,7 @@ int main(int argc, char* argv[]) {
     Verilated::debug(0);
     Verilated::commandArgs(argc, argv);
 
-    Vt_param_public* topp = new Vt_param_public;
+    VM_PREFIX* topp = new VM_PREFIX;
 
     // Make sure public tag worked
     if (static_cast<int>(Vt_param_public_t::TOP_PARAM) != 30) {
diff --git a/test_regress/t/t_public_clk.cpp b/test_regress/t/t_public_clk.cpp
index 7d27a83c8..3a76d1d7c 100644
--- a/test_regress/t/t_public_clk.cpp
+++ b/test_regress/t/t_public_clk.cpp
@@ -19,7 +19,7 @@ int main(int argc, char** argv) {
     contextp->debug(0);
     contextp->commandArgs(argc, argv);
     srand48(5);
-    topp.reset(new Vt_public_clk("top"));
+    topp.reset(new VM_PREFIX{"top"});
 
     topp->rootp->t__DOT__clk = 0;
     topp->eval();
diff --git a/test_regress/t/t_public_seq.cpp b/test_regress/t/t_public_seq.cpp
index 3299aba0c..beda4a7e3 100644
--- a/test_regress/t/t_public_seq.cpp
+++ b/test_regress/t/t_public_seq.cpp
@@ -19,7 +19,7 @@ int main(int argc, char** argv) {
     contextp->debug(0);
     contextp->commandArgs(argc, argv);
     srand48(5);
-    topp.reset(new Vt_public_seq("top"));
+    topp.reset(new VM_PREFIX{"top"});
 
     topp->clk = 0;
     topp->eval();
diff --git a/test_regress/t/t_scope_map.cpp b/test_regress/t/t_scope_map.cpp
index bfd276936..9d1e4a39e 100644
--- a/test_regress/t/t_scope_map.cpp
+++ b/test_regress/t/t_scope_map.cpp
@@ -20,7 +20,7 @@ const unsigned long long dt_2 = 3;
 int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
-    Vt_scope_map* top = new Vt_scope_map{contextp.get(), "top"};
+    VM_PREFIX* top = new VM_PREFIX{contextp.get(), "top"};
 
     contextp->debug(0);
     contextp->traceEverOn(true);
diff --git a/test_regress/t/t_trace_cat.cpp b/test_regress/t/t_trace_cat.cpp
index 488eb4187..1dc631d14 100644
--- a/test_regress/t/t_trace_cat.cpp
+++ b/test_regress/t/t_trace_cat.cpp
@@ -27,7 +27,7 @@ int main(int argc, char** argv) {
     Verilated::traceEverOn(true);
     Verilated::commandArgs(argc, argv);
 
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX{"top"}};
 
     std::unique_ptr<VerilatedVcdC> tfp{new VerilatedVcdC};
     top->trace(tfp.get(), 99);
diff --git a/test_regress/t/t_trace_cat_fst.cpp b/test_regress/t/t_trace_cat_fst.cpp
index af8e3cdf3..2467ebc39 100644
--- a/test_regress/t/t_trace_cat_fst.cpp
+++ b/test_regress/t/t_trace_cat_fst.cpp
@@ -27,7 +27,7 @@ int main(int argc, char** argv) {
     Verilated::traceEverOn(true);
     Verilated::commandArgs(argc, argv);
 
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX{"top"}};
 
     std::unique_ptr<VerilatedFstC> tfp{new VerilatedFstC};
     top->trace(tfp.get(), 99);
diff --git a/test_regress/t/t_trace_dumpvars_dyn.cpp b/test_regress/t/t_trace_dumpvars_dyn.cpp
index f143e04ba..57df372be 100644
--- a/test_regress/t/t_trace_dumpvars_dyn.cpp
+++ b/test_regress/t/t_trace_dumpvars_dyn.cpp
@@ -24,7 +24,7 @@ int main(int argc, char** argv) {
     Verilated::traceEverOn(true);
     Verilated::commandArgs(argc, argv);
 
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX{"top"}};
 
 #if defined(T_TRACE_DUMPVARS_DYN_VCD_0) || defined(T_TRACE_DUMPVARS_DYN_VCD_1)
     std::unique_ptr<VerilatedVcdC> tfp{new VerilatedVcdC};
diff --git a/test_regress/t/t_trace_public_func.cpp b/test_regress/t/t_trace_public_func.cpp
index 6cd30c21f..a05820e24 100644
--- a/test_regress/t/t_trace_public_func.cpp
+++ b/test_regress/t/t_trace_public_func.cpp
@@ -32,7 +32,7 @@ int main(int argc, char** argv) {
     Verilated::traceEverOn(true);
     Verilated::commandArgs(argc, argv);
 
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX{"top"}};
 
     std::unique_ptr<VerilatedVcdC> tfp{new VerilatedVcdC};
     top->trace(tfp.get(), 99);
diff --git a/test_regress/t/t_trace_rollover.cpp b/test_regress/t/t_trace_rollover.cpp
index b07466a29..ce4b6e130 100644
--- a/test_regress/t/t_trace_rollover.cpp
+++ b/test_regress/t/t_trace_rollover.cpp
@@ -21,7 +21,7 @@ int main(int argc, char** argv) {
     Verilated::traceEverOn(true);
     Verilated::commandArgs(argc, argv);
 
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX{"top"}};
 
     std::unique_ptr<VerilatedVcdC> tfp{new VerilatedVcdC};
     top->trace(tfp.get(), 99);
diff --git a/test_regress/t/t_tri_inout.cpp b/test_regress/t/t_tri_inout.cpp
index 8ce60aa11..8ce735b75 100644
--- a/test_regress/t/t_tri_inout.cpp
+++ b/test_regress/t/t_tri_inout.cpp
@@ -36,7 +36,7 @@ int main() {
     bool pass = true;
 
     Verilated::debug(0);
-    tb = new Vt_tri_inout{"tb"};
+    tb = new VM_PREFIX{"tb"};
 
     // loop through every possibility and check the result
     for (tb->SEL = 0; tb->SEL < 2; tb->SEL++) {
diff --git a/test_regress/t/t_tri_inz.cpp b/test_regress/t/t_tri_inz.cpp
index eccd5eaac..816533dd3 100644
--- a/test_regress/t/t_tri_inz.cpp
+++ b/test_regress/t/t_tri_inz.cpp
@@ -34,7 +34,7 @@ void check(int d, int en, int exp0, int exp1, int expx, int expz) {
 
 int main() {
     Verilated::debug(0);
-    tb = new Vt_tri_inz{"tb"};
+    tb = new VM_PREFIX{"tb"};
     check(0, 1, 1, 0, 0, 0);
     check(1, 1, 0, 1, 0, 0);
     check(0, 0, 0, 0, 0, 1);
diff --git a/test_regress/t/t_tri_pullup.cpp b/test_regress/t/t_tri_pullup.cpp
index 84fc351d1..f900d0b06 100644
--- a/test_regress/t/t_tri_pullup.cpp
+++ b/test_regress/t/t_tri_pullup.cpp
@@ -46,7 +46,7 @@ bool check() {
 int main() {
     Verilated::debug(0);
 
-    tb = new Vt_tri_pullup{"tb"};
+    tb = new VM_PREFIX{"tb"};
 
     // loop through every possibility and check the result
     bool pass = true;
diff --git a/test_regress/t/t_tri_select.cpp b/test_regress/t/t_tri_select.cpp
index ff31b307d..b3fc80f98 100644
--- a/test_regress/t/t_tri_select.cpp
+++ b/test_regress/t/t_tri_select.cpp
@@ -44,7 +44,7 @@ bool check() {
 int main() {
     Verilated::debug(0);
 
-    tb = new Vt_tri_select{"tb"};
+    tb = new VM_PREFIX{"tb"};
 
     // loop through every possibility and check the result
     bool pass = true;
diff --git a/test_regress/t/t_var_sc_bv.cpp b/test_regress/t/t_var_sc_bv.cpp
index 24e4ab7d7..306810635 100644
--- a/test_regress/t/t_var_sc_bv.cpp
+++ b/test_regress/t/t_var_sc_bv.cpp
@@ -54,7 +54,7 @@ int main()
 #endif
 {
     Verilated::debug(0);
-    tb = new VM_PREFIX("tb");
+    tb = new VM_PREFIX{"tb"};
 
     VlWide<8> /*255:0*/ input_var;
     VlWide<8> /*255:0*/ out_var;