diff --git a/src/incflo.H b/src/incflo.H
index a5d5be631..c39940e93 100644
--- a/src/incflo.H
+++ b/src/incflo.H
@@ -569,33 +569,7 @@ private:
     amrex::Vector<amrex::Real> tag_region_lo;
     amrex::Vector<amrex::Real> tag_region_hi;
 
-    // FIXME -- depreciate?
-    // Flags for saving fluid data in plot files
-    int m_plt_velx        = 1;
-    int m_plt_vely        = 1;
-    int m_plt_velz        = 1;
-    int m_plt_gpx         = 1;
-    int m_plt_gpy         = 1;
-    int m_plt_gpz         = 1;
-    int m_plt_rho         = 1;
-    int m_plt_tracer      = 1;
-    int m_plt_p           = 0;
-    int m_plt_macphi      = 0;
-    int m_plt_eta         = 0;
-    int m_plt_magvel      = 1;
-    int m_plt_vort        = 1;
-    int m_plt_forcing     = 0;
-    int m_plt_strainrate  = 0;
-    int m_plt_divu        = 0;
-    int m_plt_vfrac       = 1;
-    int m_plt_error_u     = 0;
-    int m_plt_error_v     = 0;
-    int m_plt_error_w     = 0;
-    int m_plt_error_p     = 0;
-    int m_plt_error_mac_p = 0;
-    int m_plt_particle_count = 0;
-
-    // Set default that agrees with m_plt_* defaults above
+    // Specify fluid data in plot files
     amrex::Vector<std::string> m_plotVars =
 #if (AMREX_SPACEDIM == 3)
         {"velx","vely","velz","gpx","gpy","gpz","density","tracer","magvel","vort","vfrac"};
diff --git a/src/setup/init.cpp b/src/setup/init.cpp
index 0d31bf422..1f873dec9 100644
--- a/src/setup/init.cpp
+++ b/src/setup/init.cpp
@@ -274,35 +274,105 @@ void incflo::ReadIOParameters()
     };
 
     // Check for flags to change inclusion of individual fields
-    if ( pp.query("plt_velx", m_plt_velx) ) { update_plotVars("velx", m_plt_velx); }
-    if ( pp.query("plt_vely", m_plt_vely) ) { update_plotVars("vely", m_plt_vely); }
-    if ( pp.query("plt_velz", m_plt_velz) ) { update_plotVars("velz", m_plt_velz); }
-
-    if ( pp.query("plt_gpx",  m_plt_gpx) ) { update_plotVars("gpx", m_plt_gpx); }
-    if ( pp.query("plt_gpy",  m_plt_gpy) ) { update_plotVars("gpy", m_plt_gpy); }
-    if ( pp.query("plt_gpz",  m_plt_gpz) ) { update_plotVars("gpz", m_plt_gpz); }
-
-    if ( pp.query("plt_rho",        m_plt_rho   ) ) { update_plotVars("density",m_plt_rho); }
-    if ( pp.query("plt_tracer",     m_plt_tracer) ) { update_plotVars("tracer",m_plt_tracer); }
-    if ( pp.query("plt_p   ",       m_plt_p     ) ) { update_plotVars("p",m_plt_p); }
-    if ( pp.query("plt_macphi",     m_plt_macphi) ) { update_plotVars("macphi",m_plt_macphi); }
-    if ( pp.query("plt_eta",        m_plt_eta   ) ) { update_plotVars("eta",m_plt_eta); }
-    if ( pp.query("plt_magvel",     m_plt_magvel) ) { update_plotVars("magvel",m_plt_magvel); }
-    if ( pp.query("plt_vort",       m_plt_vort  ) ) { update_plotVars("vort",m_plt_vort); }
-    if ( pp.query("plt_strainrate", m_plt_strainrate) ) { update_plotVars("strainrate",m_plt_strainrate); }
-    if ( pp.query("plt_divu",       m_plt_divu  ) ) { update_plotVars("divu",m_plt_divu); }
-    if ( pp.query("plt_vfrac",      m_plt_vfrac ) ) { update_plotVars("vfrac",m_plt_vfrac); }
-
-    if ( pp.query("plt_forcing",    m_plt_forcing ) ) { update_plotVars("forcing",m_plt_forcing); }
-
-    if ( pp.query("plt_error_u",    m_plt_error_u ) ) { update_plotVars("error_u",m_plt_error_u); }
-    if ( pp.query("plt_error_v",    m_plt_error_v ) ) { update_plotVars("error_v",m_plt_error_v); }
-    if ( pp.query("plt_error_w",    m_plt_error_w ) ) { update_plotVars("error_w",m_plt_error_w); }
-    if ( pp.query("plt_error_p",    m_plt_error_p ) ) { update_plotVars("error_p",m_plt_error_p); }
-    if ( pp.query("plt_error_mac_p",m_plt_error_mac_p ) ) { update_plotVars("error_mac_p",m_plt_error_mac_p); }
+    int plt_var;
+    if ( pp.query("plt_velx", plt_var) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("velx", plt_var);
+    }
+    if ( pp.query("plt_vely", plt_var) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("vely", plt_var);
+    }
+    if ( pp.query("plt_velz", plt_var) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("velz", plt_var);
+    }
+
+    if ( pp.query("plt_gpx",  plt_var) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("gpx", plt_var);
+    }
+    if ( pp.query("plt_gpy",  plt_var) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("gpy", plt_var);
+    }
+    if ( pp.query("plt_gpz",  plt_var) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("gpz", plt_var);
+    }
+
+    if ( pp.query("plt_rho",        plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("density",plt_var);
+    }
+    if ( pp.query("plt_tracer",     plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("tracer",plt_var);
+    }
+    if ( pp.query("plt_p   ",       plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("p",plt_var);
+    }
+    if ( pp.query("plt_macphi",     plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("macphi",plt_var);
+    }
+    if ( pp.query("plt_eta",        plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("eta",plt_var);
+    }
+    if ( pp.query("plt_magvel",     plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("magvel",plt_var);
+    }
+    if ( pp.query("plt_vort",       plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("vort",plt_var);
+    }
+    if ( pp.query("plt_strainrate", plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("strainrate",plt_var);
+    }
+    if ( pp.query("plt_divu",       plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("divu",plt_var);
+    }
+    if ( pp.query("plt_vfrac",      plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("vfrac",plt_var);
+    }
+
+    if ( pp.query("plt_forcing",    plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("forcing",plt_var);
+    }
+
+    if ( pp.query("plt_error_u",    plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("error_u",plt_var);
+    }
+    if ( pp.query("plt_error_v",    plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("error_v",plt_var);
+    }
+    if ( pp.query("plt_error_w",    plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("error_w",plt_var);
+    }
+    if ( pp.query("plt_error_p",    plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("error_p",plt_var);
+    }
+    if ( pp.query("plt_error_mac_p",plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("error_mac_p",plt_var);
+    }
 
 #ifdef INCFLO_USE_PARTICLES
-    if ( pp.query("plt_particle_count", m_plt_particle_count ) ) { update_plotVars("particle_count",m_plt_particle_count); }
+    if ( pp.query("plt_particle_count", plt_var ) ) {
+        Warning("amr.plt_* is depreciated. Please use amr.plotVariables");
+        update_plotVars("particle_count",plt_var);
+    }
 #endif
 
     // Set according to a variable list
diff --git a/test_2d/benchmark.eb_flow_const_velx b/test_2d/benchmark.eb_flow_const_velx
index ed1df397b..f7141160c 100644
--- a/test_2d/benchmark.eb_flow_const_velx
+++ b/test_2d/benchmark.eb_flow_const_velx
@@ -17,7 +17,6 @@ incflo.initial_iterations   =   0
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   1           # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_2d/benchmark.eb_flow_const_vely b/test_2d/benchmark.eb_flow_const_vely
index b2260df95..769ee90a3 100644
--- a/test_2d/benchmark.eb_flow_const_vely
+++ b/test_2d/benchmark.eb_flow_const_vely
@@ -17,7 +17,6 @@ incflo.initial_iterations   =   0
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   1           # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_2d/benchmark.eb_flow_sphere b/test_2d/benchmark.eb_flow_sphere
index 1cd331b94..9c7448ebb 100644
--- a/test_2d/benchmark.eb_flow_sphere
+++ b/test_2d/benchmark.eb_flow_sphere
@@ -17,7 +17,6 @@ incflo.initial_iterations   =   0
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   1           # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_2d/benchmark.inviscid_rotated_planes_x b/test_2d/benchmark.inviscid_rotated_planes_x
index 8cb01977f..35802d299 100644
--- a/test_2d/benchmark.inviscid_rotated_planes_x
+++ b/test_2d/benchmark.inviscid_rotated_planes_x
@@ -94,5 +94,4 @@ nodal_proj.verbose        =   1         # Nodal Projector
 scalar_diffusion.verbose  =   1         # Scalar Diffusion 
 tensor_diffusion.verbose  =   1         # Tensor Diffusion
 
-amr.plt_vfrac           =   1
-amr.plt_ccse_regtest    =   1
+amr.plotVariables = velx vely gpx gpy density tracer vfrac
diff --git a/test_2d/benchmark.rotated_planes_x b/test_2d/benchmark.rotated_planes_x
index e489c35df..ab54672c7 100644
--- a/test_2d/benchmark.rotated_planes_x
+++ b/test_2d/benchmark.rotated_planes_x
@@ -98,5 +98,4 @@ nodal_proj.verbose        =   1         # Nodal Projector
 scalar_diffusion.verbose  =   1         # Scalar Diffusion 
 tensor_diffusion.verbose  =   1         # Tensor Diffusion
 
-amr.plt_vfrac           =   1
-amr.plt_ccse_regtest    =   1
+amr.plotVariables = velx vely gpx gpy density tracer vfrac
diff --git a/test_2d/benchmark.rotated_planes_y b/test_2d/benchmark.rotated_planes_y
index f38389f3e..bf1f9fde1 100644
--- a/test_2d/benchmark.rotated_planes_y
+++ b/test_2d/benchmark.rotated_planes_y
@@ -100,5 +100,4 @@ nodal_proj.verbose        =   1         # Nodal Projector
 scalar_diffusion.verbose  =   1         # Scalar Diffusion 
 tensor_diffusion.verbose  =   1         # Tensor Diffusion
 
-amr.plt_vfrac           =   1
-amr.plt_ccse_regtest    =   1
+amr.plotVariables = velx vely gpx gpy density tracer vfrac
diff --git a/test_2d/benchmark.split b/test_2d/benchmark.split
index b3517c266..9ead00118 100644
--- a/test_2d/benchmark.split
+++ b/test_2d/benchmark.split
@@ -13,7 +13,6 @@ incflo.cfl = 0.45
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   100         # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_2d/benchmark.tracer_adv_diff b/test_2d/benchmark.tracer_adv_diff
index 28183f1eb..cd04b0a45 100644
--- a/test_2d/benchmark.tracer_adv_diff
+++ b/test_2d/benchmark.tracer_adv_diff
@@ -85,5 +85,4 @@ nodal_proj.verbose       =  0           # Nodal Projector
 scalar_diffusion.verbose =  0           # Scalar Diffusion
 tensor_diffusion.verbose =  0           # Tensor Diffusion
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vfrac           =  1
+amr.plotVariables = velx vely gpx gpy density tracer vfrac
diff --git a/test_2d/benchmark.tracer_adv_diff_cn b/test_2d/benchmark.tracer_adv_diff_cn
index 29f30b09a..d48df307a 100644
--- a/test_2d/benchmark.tracer_adv_diff_cn
+++ b/test_2d/benchmark.tracer_adv_diff_cn
@@ -83,5 +83,4 @@ incflo.verbose          =   2           # incflo_level
 mac_proj.verbose        =   1           # MAC Projector
 nodal_proj.verbose      =   1           # Nodal Projector
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vfrac           =  1
+amr.plotVariables = velx vely gpx gpy density tracer vfrac
diff --git a/test_2d/benchmark.tracer_advection b/test_2d/benchmark.tracer_advection
index ae71d4e43..0acd27d1e 100644
--- a/test_2d/benchmark.tracer_advection
+++ b/test_2d/benchmark.tracer_advection
@@ -79,5 +79,4 @@ incflo.verbose          =   2           # incflo_level
 mac_proj.verbose        =   1           # MAC Projector
 nodal_proj.verbose      =   1           # Nodal Projector
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vfrac           =  1
+amr.plotVariables = velx vely gpx gpy density tracer vfrac
diff --git a/test_2d/benchmark.vortex_in_sphere b/test_2d/benchmark.vortex_in_sphere
index 3a76b8a49..d0451d4b4 100644
--- a/test_2d/benchmark.vortex_in_sphere
+++ b/test_2d/benchmark.vortex_in_sphere
@@ -54,7 +54,6 @@ incflo.probtype         =   66
 
 nodal_proj.verbose = 4
 
-amr.plt_ccse_regtest    =   1
-amr.plt_vfrac           =   1
+amr.plotVariables = velx vely gpx gpy density tracer vfrac
 
 nodal_proj.mg_max_coarsening_level = 3
diff --git a/test_3d/benchmark.channel_sphere b/test_3d/benchmark.channel_sphere
index 3115d9932..e7d48c499 100644
--- a/test_3d/benchmark.channel_sphere
+++ b/test_3d/benchmark.channel_sphere
@@ -84,8 +84,7 @@ scalar_diffusion.verbose  =   1         # Scalar Diffusion
 tensor_diffusion.verbose =   1          # Tensor Diffusion
 tensor_diffusion.mg_verbose = 1         # Tensor Diffusion
 
-amr.plt_ccse_regtest    =   1
-amr.plt_vfrac           =   1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vfrac
 
 incflo.advect_tracer = true
 incflo.advection_type = "MOL"
diff --git a/test_3d/benchmark.double_shear_layer b/test_3d/benchmark.double_shear_layer
index fe462c4bb..f122492a0 100644
--- a/test_3d/benchmark.double_shear_layer
+++ b/test_3d/benchmark.double_shear_layer
@@ -18,4 +18,4 @@ geometry.is_periodic    =   1   1   1   # Periodicity x y z (0/1)
 
 incflo.probtype         =   21
 
-amr.plt_ccse_regtest    =   1
+amr.pltVariables        = velx vely gpx gpy density tracer magvel vort vfrac
diff --git a/test_3d/benchmark.double_shear_restart b/test_3d/benchmark.double_shear_restart
index d75a71fd9..03005c010 100644
--- a/test_3d/benchmark.double_shear_restart
+++ b/test_3d/benchmark.double_shear_restart
@@ -18,12 +18,4 @@ geometry.is_periodic    =   1   1   1   # Periodicity x y z (0/1)
 
 incflo.probtype         =   21
 
-amr.plt_ccse_regtest    =   0
-amr.plt_velx            =   1 
-amr.plt_vely            =   1 
-amr.plt_velz            =   0 
-amr.plt_gpx             =   1 
-amr.plt_gpy             =   1 
-amr.plt_gpz             =   0 
-amr.plt_rho             =   1 
-amr.plt_tracer          =   1
+amr.plotVariables = velx vely gpx gpy density tracer
diff --git a/test_3d/benchmark.eb_flow_const_velx b/test_3d/benchmark.eb_flow_const_velx
index ffcf1c42c..319d73e07 100644
--- a/test_3d/benchmark.eb_flow_const_velx
+++ b/test_3d/benchmark.eb_flow_const_velx
@@ -17,7 +17,6 @@ incflo.initial_iterations   =   0
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   1           # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_3d/benchmark.eb_flow_const_vely b/test_3d/benchmark.eb_flow_const_vely
index 9b7a931ee..05dee6307 100644
--- a/test_3d/benchmark.eb_flow_const_vely
+++ b/test_3d/benchmark.eb_flow_const_vely
@@ -17,7 +17,6 @@ incflo.initial_iterations   =   0
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   1           # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_3d/benchmark.eb_flow_const_velz b/test_3d/benchmark.eb_flow_const_velz
index 341804b7d..94b58dd1e 100644
--- a/test_3d/benchmark.eb_flow_const_velz
+++ b/test_3d/benchmark.eb_flow_const_velz
@@ -17,7 +17,6 @@ incflo.initial_iterations   =   0
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   1           # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_3d/benchmark.eb_flow_density b/test_3d/benchmark.eb_flow_density
index 4ef7d9047..c0c8da5c2 100644
--- a/test_3d/benchmark.eb_flow_density
+++ b/test_3d/benchmark.eb_flow_density
@@ -17,7 +17,6 @@ incflo.initial_iterations   =   0
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   100         # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_3d/benchmark.rotated_cylinder_x b/test_3d/benchmark.rotated_cylinder_x
index a8a331173..a291c218f 100644
--- a/test_3d/benchmark.rotated_cylinder_x
+++ b/test_3d/benchmark.rotated_cylinder_x
@@ -113,5 +113,4 @@ nodal_proj.verbose        =   1         # Nodal Projector
 scalar_diffusion.verbose  =   1         # Scalar Diffusion 
 tensor_diffusion.verbose  =   1         # Tensor Diffusion
 
-amr.plt_vfrac           =   1
-amr.plt_ccse_regtest    =   1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vfrac
diff --git a/test_3d/benchmark.rotated_cylinder_y b/test_3d/benchmark.rotated_cylinder_y
index 61de0df6a..832ec7660 100644
--- a/test_3d/benchmark.rotated_cylinder_y
+++ b/test_3d/benchmark.rotated_cylinder_y
@@ -111,5 +111,4 @@ nodal_proj.verbose        =   1         # Nodal Projector
 scalar_diffusion.verbose  =   1         # Scalar Diffusion 
 tensor_diffusion.verbose  =   1         # Tensor Diffusion
 
-amr.plt_vfrac           =   1
-amr.plt_ccse_regtest    =   1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vfrac
diff --git a/test_3d/benchmark.rotated_cylinder_z b/test_3d/benchmark.rotated_cylinder_z
index 9356df8aa..fad813ac2 100644
--- a/test_3d/benchmark.rotated_cylinder_z
+++ b/test_3d/benchmark.rotated_cylinder_z
@@ -111,5 +111,4 @@ nodal_proj.verbose        =   1         # Nodal Projector
 scalar_diffusion.verbose  =   1         # Scalar Diffusion 
 tensor_diffusion.verbose  =   1         # Tensor Diffusion
 
-amr.plt_vfrac           =   1
-amr.plt_ccse_regtest    =   1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vfrac
diff --git a/test_3d/benchmark.slanted_cylinder b/test_3d/benchmark.slanted_cylinder
index 431ede797..3073fb480 100644
--- a/test_3d/benchmark.slanted_cylinder
+++ b/test_3d/benchmark.slanted_cylinder
@@ -96,8 +96,7 @@ nodal_proj.verbose        =   1         # Nodal Projector
 scalar_diffusion.verbose  =   1         # Scalar Diffusion 
 tensor_diffusion.verbose  =   1         # Tensor Diffusion
 
-amr.plt_vfrac           =   1
-amr.plt_ccse_regtest    =   1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vfrac
 
 eb2.small_volfrac = 0.055
 eb2.extend_domain_face = 1
diff --git a/test_3d/benchmark.tracer_adv_diff b/test_3d/benchmark.tracer_adv_diff
index 95f4dc327..aba1f31e5 100644
--- a/test_3d/benchmark.tracer_adv_diff
+++ b/test_3d/benchmark.tracer_adv_diff
@@ -85,5 +85,4 @@ nodal_proj.verbose       =  0           # Nodal Projector
 scalar_diffusion.verbose =  0           # Scalar Diffusion
 tensor_diffusion.verbose =  0           # Tensor Diffusion
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vfrac           =  1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vfrac
diff --git a/test_3d/benchmark.tracer_adv_diff_cn b/test_3d/benchmark.tracer_adv_diff_cn
index d64727ee1..f9d311bb2 100644
--- a/test_3d/benchmark.tracer_adv_diff_cn
+++ b/test_3d/benchmark.tracer_adv_diff_cn
@@ -88,5 +88,4 @@ incflo.verbose          =   2           # incflo_level
 mac_proj.verbose        =   1           # MAC Projector
 nodal_proj.verbose      =   1           # Nodal Projector
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vfrac           =  1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vfrac
diff --git a/test_3d/benchmark.tracer_advection b/test_3d/benchmark.tracer_advection
index 110357b3c..ddd6e855b 100644
--- a/test_3d/benchmark.tracer_advection
+++ b/test_3d/benchmark.tracer_advection
@@ -83,5 +83,4 @@ incflo.verbose          =   2           # incflo_level
 mac_proj.verbose        =   1           # MAC Projector
 nodal_proj.verbose      =   1           # Nodal Projector
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vfrac           =  1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vfrac
diff --git a/test_3d/benchmark.upipe b/test_3d/benchmark.upipe
index a87b33d15..ac14ce0da 100644
--- a/test_3d/benchmark.upipe
+++ b/test_3d/benchmark.upipe
@@ -13,7 +13,6 @@ incflo.cfl = 0.45
 #            INPUT AND OUTPUT           #
 #.......................................#
 amr.plot_int            =   100         # Steps between plot files
-amr.plt_regtest         =   1
 
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
diff --git a/test_no_eb_2d/benchmark.bouss_bubble_god b/test_no_eb_2d/benchmark.bouss_bubble_god
index 241655ae2..f2b32e26d 100644
--- a/test_no_eb_2d/benchmark.bouss_bubble_god
+++ b/test_no_eb_2d/benchmark.bouss_bubble_god
@@ -33,8 +33,7 @@ yhi.type                = "sw"
 
 incflo.gradrhoerr       = 0.1
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1
+amr.plotVariables = velx vely gpx gpy density tracer vort
 
 incflo.advect_tracer = true
 incflo.diffusion_type   = 2             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
diff --git a/test_no_eb_2d/benchmark.bouss_bubble_mol b/test_no_eb_2d/benchmark.bouss_bubble_mol
index f73ada2ae..6efce444f 100644
--- a/test_no_eb_2d/benchmark.bouss_bubble_mol
+++ b/test_no_eb_2d/benchmark.bouss_bubble_mol
@@ -32,8 +32,7 @@ yhi.type                = "sw"
 
 incflo.gradrhoerr       = 0.1
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1
+amr.plotVariables = velx vely gpx gpy density tracer vort
 
 incflo.advect_tracer = true
 incflo.diffusion_type   = 2             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
diff --git a/test_no_eb_2d/benchmark.bouss_bubble_plm b/test_no_eb_2d/benchmark.bouss_bubble_plm
index 46991a3f7..b2f0c8827 100644
--- a/test_no_eb_2d/benchmark.bouss_bubble_plm
+++ b/test_no_eb_2d/benchmark.bouss_bubble_plm
@@ -35,8 +35,7 @@ yhi.type                = "sw"
 
 incflo.gradrhoerr       = 0.1
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1
+amr.plotVariables = velx vely gpx gpy density tracer vort
 
 incflo.advect_tracer = true
 incflo.diffusion_type   = 2             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
diff --git a/test_no_eb_2d/benchmark.burggraf b/test_no_eb_2d/benchmark.burggraf
index 2f3203043..7547f2b1e 100644
--- a/test_no_eb_2d/benchmark.burggraf
+++ b/test_no_eb_2d/benchmark.burggraf
@@ -71,6 +71,4 @@ incflo.verbose          =   1           # incflo_level
 mac_proj.verbose        =   0           # MAC Projector
 nodal_proj.verbose      =   0           # Nodal Projector
 
-amr.plt_ccse_regtest    =   1
-amr.plt_error_u         =   1
-amr.plt_error_v         =   1
+amr.plotVariables = velx vely gpx gpy density tracer error_u error_v
diff --git a/test_no_eb_2d/benchmark.double_shear_layer b/test_no_eb_2d/benchmark.double_shear_layer
index 45677b852..7723354e1 100644
--- a/test_no_eb_2d/benchmark.double_shear_layer
+++ b/test_no_eb_2d/benchmark.double_shear_layer
@@ -24,9 +24,6 @@ geometry.is_periodic    =   1   1       # Periodicity x y z (0/1)
 incflo.probtype         =  21
 incflo.constant_density = true
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1  
-
 incflo.advection_type   = "Godunov"
 incflo.diffusion_type   = 1             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
 
diff --git a/test_no_eb_2d/benchmark.rayleigh_taylor b/test_no_eb_2d/benchmark.rayleigh_taylor
index 5e79b3a74..0715332c7 100644
--- a/test_no_eb_2d/benchmark.rayleigh_taylor
+++ b/test_no_eb_2d/benchmark.rayleigh_taylor
@@ -31,8 +31,7 @@ incflo.gravity          = 0. -0.1
 
 incflo.gradrhoerr       = 0.1
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1
+amr.plotVariables = velx vely gpx gpy density tracer vort
 
 incflo.advection_type   = "Godunov"
 
diff --git a/test_no_eb_3d/benchmark.bouss_bubble_god b/test_no_eb_3d/benchmark.bouss_bubble_god
index 002e997f5..f68e47f3d 100644
--- a/test_no_eb_3d/benchmark.bouss_bubble_god
+++ b/test_no_eb_3d/benchmark.bouss_bubble_god
@@ -33,8 +33,7 @@ zhi.type                = "sw"
 
 incflo.gradrhoerr       = 0.1
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vort
 
 incflo.advect_tracer = true
 incflo.diffusion_type   = 2             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
diff --git a/test_no_eb_3d/benchmark.bouss_bubble_mol b/test_no_eb_3d/benchmark.bouss_bubble_mol
index a822b96cf..3497cd00e 100644
--- a/test_no_eb_3d/benchmark.bouss_bubble_mol
+++ b/test_no_eb_3d/benchmark.bouss_bubble_mol
@@ -31,8 +31,7 @@ zhi.type                = "sw"
 
 incflo.gradrhoerr       = 0.1
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vort
 
 incflo.advect_tracer = true
 incflo.diffusion_type   = 2             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
diff --git a/test_no_eb_3d/benchmark.bouss_bubble_plm b/test_no_eb_3d/benchmark.bouss_bubble_plm
index 604db8a94..a5c1a04ed 100644
--- a/test_no_eb_3d/benchmark.bouss_bubble_plm
+++ b/test_no_eb_3d/benchmark.bouss_bubble_plm
@@ -35,8 +35,7 @@ zhi.type                = "sw"
 
 incflo.gradrhoerr       = 0.1
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vort
 
 incflo.advect_tracer = true
 incflo.diffusion_type   = 2             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
diff --git a/test_no_eb_3d/benchmark.burggraf b/test_no_eb_3d/benchmark.burggraf
index 2d8f390e4..137990f17 100644
--- a/test_no_eb_3d/benchmark.burggraf
+++ b/test_no_eb_3d/benchmark.burggraf
@@ -72,6 +72,4 @@ incflo.verbose          =   1           # incflo_level
 mac_proj.verbose        =   0           # MAC Projector
 nodal_proj.verbose      =   0           # Nodal Projector
 
-amr.plt_ccse_regtest    =   1
-amr.plt_error_u         =   1
-amr.plt_error_v         =   1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer error_u error_v
diff --git a/test_no_eb_3d/benchmark.double_shear_layer_x b/test_no_eb_3d/benchmark.double_shear_layer_x
index 4b639786f..612881741 100644
--- a/test_no_eb_3d/benchmark.double_shear_layer_x
+++ b/test_no_eb_3d/benchmark.double_shear_layer_x
@@ -24,9 +24,6 @@ geometry.is_periodic    =   1   1   1   # Periodicity x y z (0/1)
 incflo.probtype         =  21
 incflo.constant_density = true
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1  
-
 incflo.advection_type   = "Godunov" 
 incflo.diffusion_type   = 1             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
 
diff --git a/test_no_eb_3d/benchmark.double_shear_layer_y b/test_no_eb_3d/benchmark.double_shear_layer_y
index 3a19cbd5f..51e9fabab 100644
--- a/test_no_eb_3d/benchmark.double_shear_layer_y
+++ b/test_no_eb_3d/benchmark.double_shear_layer_y
@@ -23,9 +23,6 @@ geometry.is_periodic    =   1   1   1   # Periodicity x y z (0/1)
 
 incflo.probtype         =  22
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            = 1  
-
 incflo.advection_type   = "Godunov" 
 incflo.diffusion_type   =  1             # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
 
diff --git a/test_no_eb_3d/benchmark.double_shear_layer_z b/test_no_eb_3d/benchmark.double_shear_layer_z
index cda2daf1c..491b681d7 100644
--- a/test_no_eb_3d/benchmark.double_shear_layer_z
+++ b/test_no_eb_3d/benchmark.double_shear_layer_z
@@ -23,9 +23,6 @@ geometry.is_periodic    =  1   1   1   # Periodicity x y z (0/1)
 
 incflo.probtype         =  23
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1  
-
 incflo.advection_type   = "Godunov" 
 incflo.diffusion_type   =  1            # 0 = Explicit, 1 = Crank-Nicolson, 2 = Implicit
 
diff --git a/test_no_eb_3d/benchmark.rayleigh_taylor b/test_no_eb_3d/benchmark.rayleigh_taylor
index d465621ed..308da738c 100644
--- a/test_no_eb_3d/benchmark.rayleigh_taylor
+++ b/test_no_eb_3d/benchmark.rayleigh_taylor
@@ -31,8 +31,7 @@ incflo.gravity          = 0. 0. -0.1
 
 incflo.gradrhoerr       = 0.1
 
-amr.plt_ccse_regtest    =  1
-amr.plt_vort            =  1
+amr.plotVariables = velx vely velz gpx gpy gpz density tracer vort
 
 incflo.advection_type   = "Godunov"