From 6ad58e752b6a7f0cab0bb53558e20d81fc1f2079 Mon Sep 17 00:00:00 2001
From: "Steven R. Brandt" <sbrandt@cct.lsu.edu>
Date: Mon, 29 Jul 2024 13:15:12 -0500
Subject: [PATCH 1/3] CarpetX: Change the implementation to Driver. This
 involves adding a parameter "periodic" whose only allowed value is "no." It
 also involves modifying parameter files, file names, and source files where
 the name "CarpetX" needs to be replaced by "Driver."

---
 BenchX/par/benchmark-carpetx.par                    |  2 +-
 BenchX/par/benchmark-z4c+grhydrox.par               |  2 +-
 BenchX/par/benchmark-z4c.par                        |  2 +-
 BoxInBox/interface.ccl                              |  2 +-
 BoxInBox/schedule.ccl                               |  4 ++--
 BoxInBox/test/levels1.par                           |  2 +-
 ...000.x.tsv => driver-regrid_error.it000000.x.tsv} |  0
 ...000.y.tsv => driver-regrid_error.it000000.y.tsv} |  0
 ...000.z.tsv => driver-regrid_error.it000000.z.tsv} |  0
 ...010.x.tsv => driver-regrid_error.it000010.x.tsv} |  0
 ...010.y.tsv => driver-regrid_error.it000010.y.tsv} |  0
 ...010.z.tsv => driver-regrid_error.it000010.z.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 BoxInBox/test/levels2.par                           |  2 +-
 ...000.x.tsv => driver-regrid_error.it000000.x.tsv} |  0
 ...000.y.tsv => driver-regrid_error.it000000.y.tsv} |  0
 ...000.z.tsv => driver-regrid_error.it000000.z.tsv} |  0
 ...010.x.tsv => driver-regrid_error.it000010.x.tsv} |  0
 ...010.y.tsv => driver-regrid_error.it000010.y.tsv} |  0
 ...010.z.tsv => driver-regrid_error.it000010.z.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 BoxInBox/test/levels20.par                          |  2 +-
 ...000.x.tsv => driver-regrid_error.it000000.x.tsv} |  0
 ...000.y.tsv => driver-regrid_error.it000000.y.tsv} |  0
 ...000.z.tsv => driver-regrid_error.it000000.z.tsv} |  0
 ...010.x.tsv => driver-regrid_error.it000010.x.tsv} |  0
 ...010.y.tsv => driver-regrid_error.it000010.y.tsv} |  0
 ...010.z.tsv => driver-regrid_error.it000010.z.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 BoxInBox/test/levels3.par                           |  2 +-
 ...000.x.tsv => driver-regrid_error.it000000.x.tsv} |  0
 ...000.y.tsv => driver-regrid_error.it000000.y.tsv} |  0
 ...000.z.tsv => driver-regrid_error.it000000.z.tsv} |  0
 ...010.x.tsv => driver-regrid_error.it000010.x.tsv} |  0
 ...010.y.tsv => driver-regrid_error.it000010.y.tsv} |  0
 ...010.z.tsv => driver-regrid_error.it000010.z.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 BoxInBox/test/regions2.par                          |  2 +-
 ...000.x.tsv => driver-regrid_error.it000000.x.tsv} |  0
 ...000.y.tsv => driver-regrid_error.it000000.y.tsv} |  0
 ...000.z.tsv => driver-regrid_error.it000000.z.tsv} |  0
 ...010.x.tsv => driver-regrid_error.it000010.x.tsv} |  0
 ...010.y.tsv => driver-regrid_error.it000010.y.tsv} |  0
 ...010.z.tsv => driver-regrid_error.it000010.z.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 BoxInBox/test/regions3.par                          |  2 +-
 ...000.x.tsv => driver-regrid_error.it000000.x.tsv} |  0
 ...000.y.tsv => driver-regrid_error.it000000.y.tsv} |  0
 ...000.z.tsv => driver-regrid_error.it000000.z.tsv} |  0
 ...010.x.tsv => driver-regrid_error.it000010.x.tsv} |  0
 ...010.y.tsv => driver-regrid_error.it000010.y.tsv} |  0
 ...010.z.tsv => driver-regrid_error.it000010.z.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 BoxInBox/test/unigrid.par                           |  2 +-
 ...000.x.tsv => driver-regrid_error.it000000.x.tsv} |  0
 ...000.y.tsv => driver-regrid_error.it000000.y.tsv} |  0
 ...000.z.tsv => driver-regrid_error.it000000.z.tsv} |  0
 ...010.x.tsv => driver-regrid_error.it000010.x.tsv} |  0
 ...010.y.tsv => driver-regrid_error.it000010.y.tsv} |  0
 ...010.z.tsv => driver-regrid_error.it000010.z.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 CarpetX/interface.ccl                               |  4 ++--
 CarpetX/par/brill-lindquist-checkpoint.par          |  6 +++---
 CarpetX/par/brill-lindquist-read.par                |  6 +++---
 CarpetX/par/brill-lindquist-recover.par             |  6 +++---
 CarpetX/par/brill-lindquist-write.par               |  6 +++---
 CarpetX/param.ccl                                   |  6 ++++++
 CarpetX/src/driver.cxx                              | 13 ++++++++++---
 CarpetX/src/schedule.cxx                            |  4 ++--
 ErrorEstimator/interface.ccl                        |  2 +-
 ErrorEstimator/schedule.ccl                         |  4 ++--
 FluxWaveToyX/par/standing.par                       |  6 +++---
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 FluxWaveToyX/test/standing.par                      |  6 +++---
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 MovingBoxToy/par/circle.par                         |  2 +-
 MovingBoxToy/test/circle.par                        |  2 +-
 ...000.x.tsv => driver-regrid_error.it000000.x.tsv} |  0
 ...000.y.tsv => driver-regrid_error.it000000.y.tsv} |  0
 ...000.z.tsv => driver-regrid_error.it000000.z.tsv} |  0
 ...001.x.tsv => driver-regrid_error.it000001.x.tsv} |  0
 ...001.y.tsv => driver-regrid_error.it000001.y.tsv} |  0
 ...001.z.tsv => driver-regrid_error.it000001.z.tsv} |  0
 ...002.x.tsv => driver-regrid_error.it000002.x.tsv} |  0
 ...002.y.tsv => driver-regrid_error.it000002.y.tsv} |  0
 ...002.z.tsv => driver-regrid_error.it000002.z.tsv} |  0
 ...003.x.tsv => driver-regrid_error.it000003.x.tsv} |  0
 ...003.y.tsv => driver-regrid_error.it000003.y.tsv} |  0
 ...003.z.tsv => driver-regrid_error.it000003.z.tsv} |  0
 ...004.x.tsv => driver-regrid_error.it000004.x.tsv} |  0
 ...004.y.tsv => driver-regrid_error.it000004.y.tsv} |  0
 ...004.z.tsv => driver-regrid_error.it000004.z.tsv} |  0
 ...005.x.tsv => driver-regrid_error.it000005.x.tsv} |  0
 ...005.y.tsv => driver-regrid_error.it000005.y.tsv} |  0
 ...005.z.tsv => driver-regrid_error.it000005.z.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 PoissonX/par/poissonx-fd4.par                       |  6 +++---
 PoissonX/par/poissonx-logo.par                      |  6 +++---
 PoissonX/par/poissonx-rl2.par                       |  8 ++++----
 PoissonX/par/poissonx-rl4.par                       |  8 ++++----
 PoissonX/par/poissonx.par                           |  6 +++---
 SIMDWaveToyX/par/standing.par                       |  6 +++---
 SIMDWaveToyX/test/standing.par                      |  6 +++---
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 SpacetimeWaveToyX/par/standing.par                  |  6 +++---
 SpacetimeWaveToyX/test/standing.par                 |  6 +++---
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 SpacetimeWaveToyX/test/standing/standing.par        |  6 +++---
 StaggeredWaveToyX/par/standing.par                  |  6 +++---
 StaggeredWaveToyX/test/standing.par                 |  6 +++---
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 StaggeredWaveToyX/test/standing/standing.par        |  6 +++---
 TestBoxInBox/test/moving.par                        |  2 +-
 TestDerivs/interface.ccl                            |  2 +-
 TestDerivs/schedule.ccl                             |  2 +-
 TestDerivs/test/derivs-2nd-order.par                |  8 ++++----
 TestDerivs/test/derivs-4th-order.par                |  8 ++++----
 TestDerivs/test/derivs-6th-order.par                |  8 ++++----
 TestInterpolate/test/interpolate.par                |  2 +-
 TestLoopX/interface.ccl                             |  2 +-
 TestLoopX/test/testloopx_outermost_interior.par     |  8 ++++----
 TestNorms/interface.ccl                             |  2 +-
 TestNorms/schedule.ccl                              |  2 +-
 TestNorms/test/norms.par                            |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestODESolvers/test/test-constant.par               |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestODESolvers/test/test-dp87.par                   |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestODESolvers/test/test-euler.par                  |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestODESolvers/test/test-rk2.par                    |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestODESolvers/test/test-rk3.par                    |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestODESolvers/test/test-rk4.par                    |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestODESolvers/test/test-rkf78.par                  |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestODESolvers/test/test-ssprk3.par                 |  2 +-
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 TestProlongate/interface.ccl                        |  2 +-
 TestProlongate/schedule.ccl                         |  4 ++--
 TestProlongate/test/test_cc_co_o1.par               |  2 +-
 TestProlongate/test/test_cc_nc_o1.par               |  2 +-
 TestProlongate/test/test_cc_nc_o3.par               |  2 +-
 TestProlongate/test/test_ddf_eno_o1.par             |  2 +-
 TestProlongate/test/test_ddf_eno_o3.par             |  2 +-
 TestProlongate/test/test_ddf_o1.par                 |  2 +-
 TestProlongate/test/test_ddf_o3.par                 |  2 +-
 TestProlongate/test/test_ddf_o5.par                 |  2 +-
 TestProlongate/test/test_ddf_o7.par                 |  2 +-
 TestProlongate/test/test_ddfh_o1.par                |  2 +-
 TestProlongate/test/test_ddfh_o3.par                |  2 +-
 TestProlongate/test/test_ddfh_o5.par                |  2 +-
 TestProlongate/test/test_natural_o1.par             |  2 +-
 TestProlongate/test/test_natural_o3.par             |  2 +-
 TestProlongate/test/test_natural_o5.par             |  2 +-
 TestProlongate/test/test_natural_o7.par             |  2 +-
 TestProlongate/test/test_poly_cons3lfb_o1.par       |  2 +-
 TestProlongate/test/test_poly_cons3lfb_o3.par       |  2 +-
 TestProlongate/test/test_poly_cons3lfb_o5.par       |  2 +-
 .../par/test_symmetry_xnone_ynone_znone.par         |  6 +++---
 .../test_symmetry_xperiodic_yperiodic_zperiodic.par |  6 +++---
 .../test_symmetry_xreflohi_yreflohi_zreflohi.par    |  6 +++---
 WaveToyX/interface.ccl                              |  2 +-
 WaveToyX/par/standing.par                           |  6 +++---
 WaveToyX/schedule.ccl                               |  4 ++--
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 WaveToyX/test/standing.par                          |  6 +++---
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 WaveToyX/test/standing2.par                         |  6 +++---
 ...etx-regrid_error.tsv => driver-regrid_error.tsv} |  0
 175 files changed, 172 insertions(+), 159 deletions(-)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000000.x.tsv => driver-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000000.y.tsv => driver-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000000.z.tsv => driver-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000010.x.tsv => driver-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000010.y.tsv => driver-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000010.z.tsv => driver-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels1/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000000.x.tsv => driver-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000000.y.tsv => driver-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000000.z.tsv => driver-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000010.x.tsv => driver-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000010.y.tsv => driver-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000010.z.tsv => driver-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels2/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000000.x.tsv => driver-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000000.y.tsv => driver-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000000.z.tsv => driver-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000010.x.tsv => driver-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000010.y.tsv => driver-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000010.z.tsv => driver-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels20/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000000.x.tsv => driver-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000000.y.tsv => driver-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000000.z.tsv => driver-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000010.x.tsv => driver-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000010.y.tsv => driver-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000010.z.tsv => driver-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels3/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000000.x.tsv => driver-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000000.y.tsv => driver-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000000.z.tsv => driver-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000010.x.tsv => driver-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000010.y.tsv => driver-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000010.z.tsv => driver-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/regions2/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000000.x.tsv => driver-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000000.y.tsv => driver-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000000.z.tsv => driver-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000010.x.tsv => driver-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000010.y.tsv => driver-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000010.z.tsv => driver-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/regions3/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000000.x.tsv => driver-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000000.y.tsv => driver-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000000.z.tsv => driver-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000010.x.tsv => driver-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000010.y.tsv => driver-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000010.z.tsv => driver-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/unigrid/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename FluxWaveToyX/test/radiative/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename FluxWaveToyX/test/reflecting/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename FluxWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000000.x.tsv => driver-regrid_error.it000000.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000000.y.tsv => driver-regrid_error.it000000.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000000.z.tsv => driver-regrid_error.it000000.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000001.x.tsv => driver-regrid_error.it000001.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000001.y.tsv => driver-regrid_error.it000001.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000001.z.tsv => driver-regrid_error.it000001.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000002.x.tsv => driver-regrid_error.it000002.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000002.y.tsv => driver-regrid_error.it000002.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000002.z.tsv => driver-regrid_error.it000002.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000003.x.tsv => driver-regrid_error.it000003.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000003.y.tsv => driver-regrid_error.it000003.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000003.z.tsv => driver-regrid_error.it000003.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000004.x.tsv => driver-regrid_error.it000004.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000004.y.tsv => driver-regrid_error.it000004.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000004.z.tsv => driver-regrid_error.it000004.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000005.x.tsv => driver-regrid_error.it000005.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000005.y.tsv => driver-regrid_error.it000005.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000005.z.tsv => driver-regrid_error.it000005.z.tsv} (100%)
 rename MovingBoxToy/test/circle/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename SIMDWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename SpacetimeWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename StaggeredWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestNorms/test/norms/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-constant/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-dp87/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-euler/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk2/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk3/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk4/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rkf78/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-ssprk3/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename WaveToyX/test/radiative/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename WaveToyX/test/reflecting/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename WaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)
 rename WaveToyX/test/standing2/norms/{carpetx-regrid_error.tsv => driver-regrid_error.tsv} (100%)

diff --git a/BenchX/par/benchmark-carpetx.par b/BenchX/par/benchmark-carpetx.par
index c2830dde7..6ed9b3270 100644
--- a/BenchX/par/benchmark-carpetx.par
+++ b/BenchX/par/benchmark-carpetx.par
@@ -63,7 +63,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes
diff --git a/BenchX/par/benchmark-z4c+grhydrox.par b/BenchX/par/benchmark-z4c+grhydrox.par
index fde794a85..17e2af0e2 100644
--- a/BenchX/par/benchmark-z4c+grhydrox.par
+++ b/BenchX/par/benchmark-z4c+grhydrox.par
@@ -66,7 +66,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes
diff --git a/BenchX/par/benchmark-z4c.par b/BenchX/par/benchmark-z4c.par
index 39ef13978..6a213119b 100644
--- a/BenchX/par/benchmark-z4c.par
+++ b/BenchX/par/benchmark-z4c.par
@@ -63,7 +63,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes
diff --git a/BoxInBox/interface.ccl b/BoxInBox/interface.ccl
index 2839d7a4b..acb099e21 100644
--- a/BoxInBox/interface.ccl
+++ b/BoxInBox/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: BoxInBox
 
-INHERITS: CarpetX
+INHERITS: Driver
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/BoxInBox/schedule.ccl b/BoxInBox/schedule.ccl
index ee59596ca..3471f03b7 100644
--- a/BoxInBox/schedule.ccl
+++ b/BoxInBox/schedule.ccl
@@ -19,7 +19,7 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT postinitial
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: Driver::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
@@ -30,5 +30,5 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: Driver::regrid_error(interior)
 } "Estimate error"
diff --git a/BoxInBox/test/levels1.par b/BoxInBox/test/levels1.par
index f15f1b547..5ae262e1a 100644
--- a/BoxInBox/test/levels1.par
+++ b/BoxInBox/test/levels1.par
@@ -38,7 +38,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/levels1/driver-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels1/driver-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/levels1/driver-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels1/driver-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/levels1/driver-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels1/driver-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/levels1/driver-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels1/driver-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/levels1/driver-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels1/driver-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/levels1/driver-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels1/driver-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels1/norms/carpetx-regrid_error.tsv b/BoxInBox/test/levels1/norms/driver-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels1/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/levels1/norms/driver-regrid_error.tsv
diff --git a/BoxInBox/test/levels2.par b/BoxInBox/test/levels2.par
index 902923907..0ebd18571 100644
--- a/BoxInBox/test/levels2.par
+++ b/BoxInBox/test/levels2.par
@@ -39,7 +39,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/levels2/driver-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels2/driver-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/levels2/driver-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels2/driver-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/levels2/driver-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels2/driver-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/levels2/driver-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels2/driver-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/levels2/driver-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels2/driver-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/levels2/driver-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels2/driver-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels2/norms/carpetx-regrid_error.tsv b/BoxInBox/test/levels2/norms/driver-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels2/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/levels2/norms/driver-regrid_error.tsv
diff --git a/BoxInBox/test/levels20.par b/BoxInBox/test/levels20.par
index f892cfada..0b56ed1ef 100644
--- a/BoxInBox/test/levels20.par
+++ b/BoxInBox/test/levels20.par
@@ -57,7 +57,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/levels20/driver-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels20/driver-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/levels20/driver-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels20/driver-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/levels20/driver-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels20/driver-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/levels20/driver-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels20/driver-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/levels20/driver-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels20/driver-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/levels20/driver-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels20/driver-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels20/norms/carpetx-regrid_error.tsv b/BoxInBox/test/levels20/norms/driver-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels20/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/levels20/norms/driver-regrid_error.tsv
diff --git a/BoxInBox/test/levels3.par b/BoxInBox/test/levels3.par
index 5abd93211..ba7f66089 100644
--- a/BoxInBox/test/levels3.par
+++ b/BoxInBox/test/levels3.par
@@ -40,7 +40,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/levels3/driver-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels3/driver-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/levels3/driver-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels3/driver-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/levels3/driver-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels3/driver-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/levels3/driver-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels3/driver-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/levels3/driver-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels3/driver-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/levels3/driver-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels3/driver-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels3/norms/carpetx-regrid_error.tsv b/BoxInBox/test/levels3/norms/driver-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels3/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/levels3/norms/driver-regrid_error.tsv
diff --git a/BoxInBox/test/regions2.par b/BoxInBox/test/regions2.par
index a8ddd0c78..04d7570ab 100644
--- a/BoxInBox/test/regions2.par
+++ b/BoxInBox/test/regions2.par
@@ -49,7 +49,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/regions2/driver-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/regions2/driver-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/regions2/driver-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/regions2/driver-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/regions2/driver-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/regions2/driver-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/regions2/driver-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/regions2/driver-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/regions2/driver-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/regions2/driver-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/regions2/driver-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/regions2/driver-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/regions2/norms/carpetx-regrid_error.tsv b/BoxInBox/test/regions2/norms/driver-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/regions2/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/regions2/norms/driver-regrid_error.tsv
diff --git a/BoxInBox/test/regions3.par b/BoxInBox/test/regions3.par
index 2b40799db..fa1810b00 100644
--- a/BoxInBox/test/regions3.par
+++ b/BoxInBox/test/regions3.par
@@ -60,7 +60,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/regions3/driver-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/regions3/driver-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/regions3/driver-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/regions3/driver-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/regions3/driver-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/regions3/driver-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/regions3/driver-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/regions3/driver-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/regions3/driver-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/regions3/driver-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/regions3/driver-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/regions3/driver-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/regions3/norms/carpetx-regrid_error.tsv b/BoxInBox/test/regions3/norms/driver-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/regions3/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/regions3/norms/driver-regrid_error.tsv
diff --git a/BoxInBox/test/unigrid.par b/BoxInBox/test/unigrid.par
index 76dc53103..f90231382 100644
--- a/BoxInBox/test/unigrid.par
+++ b/BoxInBox/test/unigrid.par
@@ -37,7 +37,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/unigrid/driver-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/unigrid/driver-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/unigrid/driver-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/unigrid/driver-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/unigrid/driver-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/unigrid/driver-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/unigrid/driver-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/unigrid/driver-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/unigrid/driver-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/unigrid/driver-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/unigrid/driver-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/unigrid/driver-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/unigrid/norms/carpetx-regrid_error.tsv b/BoxInBox/test/unigrid/norms/driver-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/unigrid/norms/driver-regrid_error.tsv
diff --git a/CarpetX/interface.ccl b/CarpetX/interface.ccl
index 2f543ad08..ea60a4d20 100644
--- a/CarpetX/interface.ccl
+++ b/CarpetX/interface.ccl
@@ -1,6 +1,6 @@
 # Interface definition for thorn CarpetX
 
-IMPLEMENTS: CarpetX
+IMPLEMENTS: Driver
 
 INHERITS: IO
 
@@ -171,7 +171,7 @@ PROVIDES FUNCTION DriverInterpolate WITH CarpetX_DriverInterpolate LANGUAGE C
 
 PUBLIC:
 
-CCTK_REAL regrid_error TYPE=gf CENTERING={ccc} TAGS='checkpoint="no"'
+CCTK_REAL regrid_error TYPE=gf dim=default_dim CENTERING={ccc} TAGS='checkpoint="no"'
 {
   regrid_error
 } "Regridding condition"
diff --git a/CarpetX/par/brill-lindquist-checkpoint.par b/CarpetX/par/brill-lindquist-checkpoint.par
index 7ae5391d1..b002f086b 100644
--- a/CarpetX/par/brill-lindquist-checkpoint.par
+++ b/CarpetX/par/brill-lindquist-checkpoint.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes
diff --git a/CarpetX/par/brill-lindquist-read.par b/CarpetX/par/brill-lindquist-read.par
index 3e31d7b07..faa20da2b 100644
--- a/CarpetX/par/brill-lindquist-read.par
+++ b/CarpetX/par/brill-lindquist-read.par
@@ -28,9 +28,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes
diff --git a/CarpetX/par/brill-lindquist-recover.par b/CarpetX/par/brill-lindquist-recover.par
index 725ff0b8f..e7990183a 100644
--- a/CarpetX/par/brill-lindquist-recover.par
+++ b/CarpetX/par/brill-lindquist-recover.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes
diff --git a/CarpetX/par/brill-lindquist-write.par b/CarpetX/par/brill-lindquist-write.par
index a587c0fc0..72426410b 100644
--- a/CarpetX/par/brill-lindquist-write.par
+++ b/CarpetX/par/brill-lindquist-write.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes
diff --git a/CarpetX/param.ccl b/CarpetX/param.ccl
index 806f987f9..3627378ff 100644
--- a/CarpetX/param.ccl
+++ b/CarpetX/param.ccl
@@ -71,6 +71,12 @@ CCTK_INT ncells_z "Number of grid cells"
 
 RESTRICTED:
 
+# Do not use
+BOOLEAN periodic "Periodic"
+{
+ no :: "Only valid value"
+} no
+
 BOOLEAN periodic_x "Periodic"
 {
 } no
diff --git a/CarpetX/src/driver.cxx b/CarpetX/src/driver.cxx
index c6536621c..0ea07d784 100644
--- a/CarpetX/src/driver.cxx
+++ b/CarpetX/src/driver.cxx
@@ -216,12 +216,19 @@ array<array<boundary_t, dim>, 2> get_default_boundaries() {
           bool(CCTK_EQUALS(boundary_upper_z, "robin")),
       }},
   }};
-  for (int f = 0; f < 2; ++f)
-    for (int d = 0; d < dim; ++d)
+  for (int f = 0; f < 2; ++f) {
+    for (int d = 0; d < dim; ++d) {
+      std::cout << "f=" << f << " d=" << d << std::endl;
+      std::cout << "is_symmetry[f][d]=" << is_symmetry[f][d] << std::endl;
+      std::cout << "is_dirichlet[f][d]=" << is_dirichlet[f][d] << std::endl;
+      std::cout << "is_neumann[f][d]=" << is_neumann[f][d] << std::endl;
+      std::cout << "is_robin[f][d]=" << is_robin[f][d] << std::endl;
       assert(is_symmetry[f][d] + is_dirichlet[f][d] +
                  is_linear_extrapolation[f][d] + is_neumann[f][d] +
                  is_robin[f][d] <=
              1);
+    }
+  }
 
   array<array<boundary_t, dim>, 2> boundaries;
   for (int f = 0; f < 2; ++f)
@@ -1527,7 +1534,7 @@ void CactusAmrCore::ErrorEst(const int level, amrex::TagBoxArray &tags,
 #pragma omp critical
     CCTK_VINFO("ErrorEst patch %d level %d", patch, level);
 
-  const int gi = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi = CCTK_GroupIndex("Driver::regrid_error");
   assert(gi >= 0);
   const int vi = 0;
   const int tl = 0;
diff --git a/CarpetX/src/schedule.cxx b/CarpetX/src/schedule.cxx
index 09313dfc3..8ff563e80 100644
--- a/CarpetX/src/schedule.cxx
+++ b/CarpetX/src/schedule.cxx
@@ -2240,7 +2240,7 @@ int SyncGroupsByDirI(const cGH *restrict cctkGH, int numgroups,
     CCTK_VINFO("SyncGroups %s", buf.str().c_str());
   }
 
-  const int gi_regrid_error = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("Driver::regrid_error");
   assert(gi_regrid_error >= 0);
 
   vector<int> groups;
@@ -2621,7 +2621,7 @@ void Restrict(const cGH *cctkGH, int level, const vector<int> &groups) {
   static Timer timer("Restrict");
   Interval interval(timer);
 
-  const int gi_regrid_error = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("Driver::regrid_error");
   assert(gi_regrid_error >= 0);
 
   for (const auto &patchdata : ghext->patchdata) {
diff --git a/ErrorEstimator/interface.ccl b/ErrorEstimator/interface.ccl
index 08e82c25c..f0fd3693e 100644
--- a/ErrorEstimator/interface.ccl
+++ b/ErrorEstimator/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: ErrorEstimator
 
-INHERITS: CarpetX
+INHERITS: Driver
 
 
 
diff --git a/ErrorEstimator/schedule.ccl b/ErrorEstimator/schedule.ccl
index 7c7244946..12e797196 100644
--- a/ErrorEstimator/schedule.ccl
+++ b/ErrorEstimator/schedule.ccl
@@ -5,11 +5,11 @@
 SCHEDULE ErrorEstimator_Estimate AS EstimateError AT postinitial
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: Driver::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE ErrorEstimator_Estimate AS EstimateError AT poststep
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: Driver::regrid_error(interior)
 } "Estimate error"
diff --git a/FluxWaveToyX/par/standing.par b/FluxWaveToyX/par/standing.par
index 17fd186ad..96239366a 100644
--- a/FluxWaveToyX/par/standing.par
+++ b/FluxWaveToyX/par/standing.par
@@ -13,9 +13,9 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/FluxWaveToyX/test/radiative/norms/carpetx-regrid_error.tsv b/FluxWaveToyX/test/radiative/norms/driver-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/radiative/norms/carpetx-regrid_error.tsv
rename to FluxWaveToyX/test/radiative/norms/driver-regrid_error.tsv
diff --git a/FluxWaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv b/FluxWaveToyX/test/reflecting/norms/driver-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv
rename to FluxWaveToyX/test/reflecting/norms/driver-regrid_error.tsv
diff --git a/FluxWaveToyX/test/standing.par b/FluxWaveToyX/test/standing.par
index 808ab744d..e071a07c0 100644
--- a/FluxWaveToyX/test/standing.par
+++ b/FluxWaveToyX/test/standing.par
@@ -14,9 +14,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
diff --git a/FluxWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/FluxWaveToyX/test/standing/norms/driver-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to FluxWaveToyX/test/standing/norms/driver-regrid_error.tsv
diff --git a/MovingBoxToy/par/circle.par b/MovingBoxToy/par/circle.par
index f41454fc1..df8345e88 100644
--- a/MovingBoxToy/par/circle.par
+++ b/MovingBoxToy/par/circle.par
@@ -52,7 +52,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_silo_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/MovingBoxToy/test/circle.par b/MovingBoxToy/test/circle.par
index 4c5e29fed..2cf02d40f 100644
--- a/MovingBoxToy/test/circle.par
+++ b/MovingBoxToy/test/circle.par
@@ -52,7 +52,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000000.x.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000000.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000000.x.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000000.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000000.y.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000000.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000000.y.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000000.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000000.z.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000000.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000000.z.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000000.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000001.x.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000001.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000001.x.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000001.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000001.y.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000001.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000001.y.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000001.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000001.z.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000001.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000001.z.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000001.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000002.x.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000002.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000002.x.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000002.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000002.y.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000002.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000002.y.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000002.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000002.z.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000002.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000002.z.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000002.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000003.x.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000003.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000003.x.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000003.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000003.y.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000003.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000003.y.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000003.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000003.z.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000003.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000003.z.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000003.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000004.x.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000004.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000004.x.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000004.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000004.y.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000004.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000004.y.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000004.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000004.z.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000004.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000004.z.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000004.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000005.x.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000005.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000005.x.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000005.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000005.y.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000005.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000005.y.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000005.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000005.z.tsv b/MovingBoxToy/test/circle/driver-regrid_error.it000005.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000005.z.tsv
rename to MovingBoxToy/test/circle/driver-regrid_error.it000005.z.tsv
diff --git a/MovingBoxToy/test/circle/norms/carpetx-regrid_error.tsv b/MovingBoxToy/test/circle/norms/driver-regrid_error.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/norms/carpetx-regrid_error.tsv
rename to MovingBoxToy/test/circle/norms/driver-regrid_error.tsv
diff --git a/PoissonX/par/poissonx-fd4.par b/PoissonX/par/poissonx-fd4.par
index fea9f23b0..44b40bf3d 100644
--- a/PoissonX/par/poissonx-fd4.par
+++ b/PoissonX/par/poissonx-fd4.par
@@ -27,9 +27,9 @@ CarpetX::ncells_x = 16
 CarpetX::ncells_y = 16
 CarpetX::ncells_z = 16
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 2
 
diff --git a/PoissonX/par/poissonx-logo.par b/PoissonX/par/poissonx-logo.par
index 382d13bca..4d1449257 100644
--- a/PoissonX/par/poissonx-logo.par
+++ b/PoissonX/par/poissonx-logo.par
@@ -26,9 +26,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 1
 
diff --git a/PoissonX/par/poissonx-rl2.par b/PoissonX/par/poissonx-rl2.par
index 7ba049dee..ed6f5896e 100644
--- a/PoissonX/par/poissonx-rl2.par
+++ b/PoissonX/par/poissonx-rl2.par
@@ -28,15 +28,15 @@ CarpetX::ncells_x = 16
 CarpetX::ncells_y = 16
 CarpetX::ncells_z = 16
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 1
 
 CarpetX::max_num_levels = 2
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.5 / 2.0
+Driver::regrid_error_threshold = 2.5 / 2.0
 
 CarpetX::prolongation_type = "ddf"
 CarpetX::prolongation_order = 1
diff --git a/PoissonX/par/poissonx-rl4.par b/PoissonX/par/poissonx-rl4.par
index f00e55de3..a736563a1 100644
--- a/PoissonX/par/poissonx-rl4.par
+++ b/PoissonX/par/poissonx-rl4.par
@@ -28,15 +28,15 @@ CarpetX::ncells_x = 16
 CarpetX::ncells_y = 16
 CarpetX::ncells_z = 16
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 1
 
 CarpetX::max_num_levels = 4
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.5 / 2.0
+Driver::regrid_error_threshold = 2.5 / 2.0
 
 CarpetX::prolongation_type = "ddf"
 CarpetX::prolongation_order = 1
diff --git a/PoissonX/par/poissonx.par b/PoissonX/par/poissonx.par
index ffb7fe9ab..66c9bc013 100644
--- a/PoissonX/par/poissonx.par
+++ b/PoissonX/par/poissonx.par
@@ -27,9 +27,9 @@ CarpetX::ncells_x = 16
 CarpetX::ncells_y = 16
 CarpetX::ncells_z = 16
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 1
 
diff --git a/SIMDWaveToyX/par/standing.par b/SIMDWaveToyX/par/standing.par
index 219f6ca89..b3196fc12 100644
--- a/SIMDWaveToyX/par/standing.par
+++ b/SIMDWaveToyX/par/standing.par
@@ -13,9 +13,9 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/SIMDWaveToyX/test/standing.par b/SIMDWaveToyX/test/standing.par
index eb21a0953..bb3a4fde4 100644
--- a/SIMDWaveToyX/test/standing.par
+++ b/SIMDWaveToyX/test/standing.par
@@ -14,9 +14,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
diff --git a/SIMDWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/SIMDWaveToyX/test/standing/norms/driver-regrid_error.tsv
similarity index 100%
rename from SIMDWaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to SIMDWaveToyX/test/standing/norms/driver-regrid_error.tsv
diff --git a/SpacetimeWaveToyX/par/standing.par b/SpacetimeWaveToyX/par/standing.par
index b5f24dbd5..3bd99004b 100644
--- a/SpacetimeWaveToyX/par/standing.par
+++ b/SpacetimeWaveToyX/par/standing.par
@@ -12,9 +12,9 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/SpacetimeWaveToyX/test/standing.par b/SpacetimeWaveToyX/test/standing.par
index 0cd26083e..9b6356cc6 100644
--- a/SpacetimeWaveToyX/test/standing.par
+++ b/SpacetimeWaveToyX/test/standing.par
@@ -15,9 +15,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/SpacetimeWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/SpacetimeWaveToyX/test/standing/norms/driver-regrid_error.tsv
similarity index 100%
rename from SpacetimeWaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to SpacetimeWaveToyX/test/standing/norms/driver-regrid_error.tsv
diff --git a/SpacetimeWaveToyX/test/standing/standing.par b/SpacetimeWaveToyX/test/standing/standing.par
index 0cd26083e..9b6356cc6 100644
--- a/SpacetimeWaveToyX/test/standing/standing.par
+++ b/SpacetimeWaveToyX/test/standing/standing.par
@@ -15,9 +15,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/StaggeredWaveToyX/par/standing.par b/StaggeredWaveToyX/par/standing.par
index 6bcee9682..c05a7a465 100644
--- a/StaggeredWaveToyX/par/standing.par
+++ b/StaggeredWaveToyX/par/standing.par
@@ -13,9 +13,9 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/StaggeredWaveToyX/test/standing.par b/StaggeredWaveToyX/test/standing.par
index c7b9a407d..2afb2bfe1 100644
--- a/StaggeredWaveToyX/test/standing.par
+++ b/StaggeredWaveToyX/test/standing.par
@@ -16,9 +16,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
diff --git a/StaggeredWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/StaggeredWaveToyX/test/standing/norms/driver-regrid_error.tsv
similarity index 100%
rename from StaggeredWaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to StaggeredWaveToyX/test/standing/norms/driver-regrid_error.tsv
diff --git a/StaggeredWaveToyX/test/standing/standing.par b/StaggeredWaveToyX/test/standing/standing.par
index c7b9a407d..2afb2bfe1 100644
--- a/StaggeredWaveToyX/test/standing/standing.par
+++ b/StaggeredWaveToyX/test/standing/standing.par
@@ -16,9 +16,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
diff --git a/TestBoxInBox/test/moving.par b/TestBoxInBox/test/moving.par
index 204da46bc..8d7c56329 100644
--- a/TestBoxInBox/test/moving.par
+++ b/TestBoxInBox/test/moving.par
@@ -40,7 +40,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/TestDerivs/interface.ccl b/TestDerivs/interface.ccl
index f3b757fa7..c176732af 100644
--- a/TestDerivs/interface.ccl
+++ b/TestDerivs/interface.ccl
@@ -1,7 +1,7 @@
 # Interface definition for thorn TestDerivs
 IMPLEMENTS: TestDerivs
 
-INHERITS: CarpetX
+INHERITS: Driver
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/TestDerivs/schedule.ccl b/TestDerivs/schedule.ccl
index caa8cbd62..9252af71d 100644
--- a/TestDerivs/schedule.ccl
+++ b/TestDerivs/schedule.ccl
@@ -7,7 +7,7 @@ STORAGE: ddchi
 SCHEDULE TestDerivs_SetError AT postinitial
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: Driver::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestDerivs_Set AT initial
diff --git a/TestDerivs/test/derivs-2nd-order.par b/TestDerivs/test/derivs-2nd-order.par
index 1e5e4b8b8..d7f2858ff 100644
--- a/TestDerivs/test/derivs-2nd-order.par
+++ b/TestDerivs/test/derivs-2nd-order.par
@@ -25,9 +25,9 @@ CarpetX::xmax = 0.1234567+$pi
 CarpetX::ymax = 0.2345678+$pi
 CarpetX::zmax = 0.3456789+$pi
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
@@ -39,7 +39,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestDerivs/test/derivs-4th-order.par b/TestDerivs/test/derivs-4th-order.par
index 4110188f6..998b22b64 100644
--- a/TestDerivs/test/derivs-4th-order.par
+++ b/TestDerivs/test/derivs-4th-order.par
@@ -25,9 +25,9 @@ CarpetX::xmax = 0.1234567+$pi
 CarpetX::ymax = 0.2345678+$pi
 CarpetX::zmax = 0.3456789+$pi
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
@@ -39,7 +39,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestDerivs/test/derivs-6th-order.par b/TestDerivs/test/derivs-6th-order.par
index e5ab0553a..5688e4ad6 100644
--- a/TestDerivs/test/derivs-6th-order.par
+++ b/TestDerivs/test/derivs-6th-order.par
@@ -25,9 +25,9 @@ CarpetX::xmax = 0.1234567+$pi
 CarpetX::ymax = 0.2345678+$pi
 CarpetX::zmax = 0.3456789+$pi
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
@@ -39,7 +39,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestInterpolate/test/interpolate.par b/TestInterpolate/test/interpolate.par
index e9038e00c..98a303a91 100644
--- a/TestInterpolate/test/interpolate.par
+++ b/TestInterpolate/test/interpolate.par
@@ -31,7 +31,7 @@ CarpetX::ncells_z = $ncells
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 16
-CarpetX::regrid_error_threshold = 5.0
+Driver::regrid_error_threshold = 5.0
 
 CarpetX::prolongation_type = "ddf"
 
diff --git a/TestLoopX/interface.ccl b/TestLoopX/interface.ccl
index 8bf2c7784..434bc0521 100644
--- a/TestLoopX/interface.ccl
+++ b/TestLoopX/interface.ccl
@@ -1,7 +1,7 @@
 # Interface definition for thorn TestLoopX
 IMPLEMENTS: TestLoopX
 
-INHERITS: CarpetX
+INHERITS: Driver
 
 USES INCLUDE HEADER: loop.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/TestLoopX/test/testloopx_outermost_interior.par b/TestLoopX/test/testloopx_outermost_interior.par
index 9560d6ea9..ee42653e1 100644
--- a/TestLoopX/test/testloopx_outermost_interior.par
+++ b/TestLoopX/test/testloopx_outermost_interior.par
@@ -19,9 +19,9 @@ CarpetX::xmax = +10
 CarpetX::ymax = +10
 CarpetX::zmax = +10
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = 40
 CarpetX::ncells_y = 40
@@ -29,7 +29,7 @@ CarpetX::ncells_z = 40
 
 CarpetX::max_num_levels = 1
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestNorms/interface.ccl b/TestNorms/interface.ccl
index fd4cbfe08..56f7648b2 100644
--- a/TestNorms/interface.ccl
+++ b/TestNorms/interface.ccl
@@ -1,6 +1,6 @@
 # Interface definition for thorn TestNorms
 implements: TestNorms
-inherits: CarpetX
+inherits: Driver
 
 uses include header: loop.hxx
 
diff --git a/TestNorms/schedule.ccl b/TestNorms/schedule.ccl
index a570af2ed..370259897 100644
--- a/TestNorms/schedule.ccl
+++ b/TestNorms/schedule.ccl
@@ -12,7 +12,7 @@ STORAGE: gf111
 SCHEDULE TestNorms_SetError AT postinitial
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: Driver::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestNorms_Set AT initial
diff --git a/TestNorms/test/norms.par b/TestNorms/test/norms.par
index 6cca27eca..8ab177a13 100644
--- a/TestNorms/test/norms.par
+++ b/TestNorms/test/norms.par
@@ -37,7 +37,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestNorms/test/norms/norms/carpetx-regrid_error.tsv b/TestNorms/test/norms/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestNorms/test/norms/norms/carpetx-regrid_error.tsv
rename to TestNorms/test/norms/norms/driver-regrid_error.tsv
diff --git a/TestODESolvers/test/test-constant.par b/TestODESolvers/test/test-constant.par
index 35d8548fd..f57cf6120 100644
--- a/TestODESolvers/test/test-constant.par
+++ b/TestODESolvers/test/test-constant.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-constant/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-constant/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-constant/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-constant/norms/driver-regrid_error.tsv
diff --git a/TestODESolvers/test/test-dp87.par b/TestODESolvers/test/test-dp87.par
index dceb637c9..3ae0fc57e 100644
--- a/TestODESolvers/test/test-dp87.par
+++ b/TestODESolvers/test/test-dp87.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-dp87/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-dp87/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-dp87/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-dp87/norms/driver-regrid_error.tsv
diff --git a/TestODESolvers/test/test-euler.par b/TestODESolvers/test/test-euler.par
index bbdca6842..e0e104523 100644
--- a/TestODESolvers/test/test-euler.par
+++ b/TestODESolvers/test/test-euler.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-euler/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-euler/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-euler/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-euler/norms/driver-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk2.par b/TestODESolvers/test/test-rk2.par
index dea37ccd9..7cf32e91e 100644
--- a/TestODESolvers/test/test-rk2.par
+++ b/TestODESolvers/test/test-rk2.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk2/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-rk2/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk2/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-rk2/norms/driver-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk3.par b/TestODESolvers/test/test-rk3.par
index da5c84652..e405c3bb2 100644
--- a/TestODESolvers/test/test-rk3.par
+++ b/TestODESolvers/test/test-rk3.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk3/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-rk3/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk3/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-rk3/norms/driver-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk4.par b/TestODESolvers/test/test-rk4.par
index aa27f72eb..f05091f93 100644
--- a/TestODESolvers/test/test-rk4.par
+++ b/TestODESolvers/test/test-rk4.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk4/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-rk4/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk4/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-rk4/norms/driver-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rkf78.par b/TestODESolvers/test/test-rkf78.par
index b647fc468..e95bb5410 100644
--- a/TestODESolvers/test/test-rkf78.par
+++ b/TestODESolvers/test/test-rkf78.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rkf78/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-rkf78/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rkf78/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-rkf78/norms/driver-regrid_error.tsv
diff --git a/TestODESolvers/test/test-ssprk3.par b/TestODESolvers/test/test-ssprk3.par
index 3e67eed4d..be4ee11db 100644
--- a/TestODESolvers/test/test-ssprk3.par
+++ b/TestODESolvers/test/test-ssprk3.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    Driver::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-ssprk3/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-ssprk3/norms/driver-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-ssprk3/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-ssprk3/norms/driver-regrid_error.tsv
diff --git a/TestProlongate/interface.ccl b/TestProlongate/interface.ccl
index d68ba3ed8..ab93a2448 100644
--- a/TestProlongate/interface.ccl
+++ b/TestProlongate/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: TestProlongate
 
-INHERITS: CarpetX
+INHERITS: Driver
 
 USES INCLUDE HEADER: loop.hxx
 
diff --git a/TestProlongate/schedule.ccl b/TestProlongate/schedule.ccl
index fd796129e..f37cce6be 100644
--- a/TestProlongate/schedule.ccl
+++ b/TestProlongate/schedule.ccl
@@ -50,13 +50,13 @@ STORAGE: gf111_sum_count
 SCHEDULE TestProlongate_Regrid AT postinitial
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: Driver::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestProlongate_Regrid AT poststep
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: Driver::regrid_error(interior)
 } "Set up test grid"
 
 
diff --git a/TestProlongate/test/test_cc_co_o1.par b/TestProlongate/test/test_cc_co_o1.par
index e8a4b932b..c83ad17cb 100644
--- a/TestProlongate/test/test_cc_co_o1.par
+++ b/TestProlongate/test/test_cc_co_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_cc_nc_o1.par b/TestProlongate/test/test_cc_nc_o1.par
index edcf87344..892b2a274 100644
--- a/TestProlongate/test/test_cc_nc_o1.par
+++ b/TestProlongate/test/test_cc_nc_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_cc_nc_o3.par b/TestProlongate/test/test_cc_nc_o3.par
index f920b1b80..29ddc320a 100644
--- a/TestProlongate/test/test_cc_nc_o3.par
+++ b/TestProlongate/test/test_cc_nc_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddf_eno_o1.par b/TestProlongate/test/test_ddf_eno_o1.par
index 91d0d0e0b..804367e6d 100644
--- a/TestProlongate/test/test_ddf_eno_o1.par
+++ b/TestProlongate/test/test_ddf_eno_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddf_eno_o3.par b/TestProlongate/test/test_ddf_eno_o3.par
index da3a97a3c..0609b541f 100644
--- a/TestProlongate/test/test_ddf_eno_o3.par
+++ b/TestProlongate/test/test_ddf_eno_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddf_o1.par b/TestProlongate/test/test_ddf_o1.par
index 71aaf5253..c254f983b 100644
--- a/TestProlongate/test/test_ddf_o1.par
+++ b/TestProlongate/test/test_ddf_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddf_o3.par b/TestProlongate/test/test_ddf_o3.par
index 6b43b15c9..de407cef6 100644
--- a/TestProlongate/test/test_ddf_o3.par
+++ b/TestProlongate/test/test_ddf_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddf_o5.par b/TestProlongate/test/test_ddf_o5.par
index 9c692e127..8119d2e75 100644
--- a/TestProlongate/test/test_ddf_o5.par
+++ b/TestProlongate/test/test_ddf_o5.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddf_o7.par b/TestProlongate/test/test_ddf_o7.par
index aefb3701e..34448ed55 100644
--- a/TestProlongate/test/test_ddf_o7.par
+++ b/TestProlongate/test/test_ddf_o7.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddfh_o1.par b/TestProlongate/test/test_ddfh_o1.par
index eef2985d6..9fa9ac405 100644
--- a/TestProlongate/test/test_ddfh_o1.par
+++ b/TestProlongate/test/test_ddfh_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddfh_o3.par b/TestProlongate/test/test_ddfh_o3.par
index f999e62dc..dfe246880 100644
--- a/TestProlongate/test/test_ddfh_o3.par
+++ b/TestProlongate/test/test_ddfh_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_ddfh_o5.par b/TestProlongate/test/test_ddfh_o5.par
index 3561cb31a..8c0f5855b 100644
--- a/TestProlongate/test/test_ddfh_o5.par
+++ b/TestProlongate/test/test_ddfh_o5.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_natural_o1.par b/TestProlongate/test/test_natural_o1.par
index da484e1b3..f74b3e4bf 100644
--- a/TestProlongate/test/test_natural_o1.par
+++ b/TestProlongate/test/test_natural_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_natural_o3.par b/TestProlongate/test/test_natural_o3.par
index 2f924de16..946a7ead1 100644
--- a/TestProlongate/test/test_natural_o3.par
+++ b/TestProlongate/test/test_natural_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_natural_o5.par b/TestProlongate/test/test_natural_o5.par
index a15814b7d..2d99fd3c0 100644
--- a/TestProlongate/test/test_natural_o5.par
+++ b/TestProlongate/test/test_natural_o5.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_natural_o7.par b/TestProlongate/test/test_natural_o7.par
index 3064d750b..d71be4b31 100644
--- a/TestProlongate/test/test_natural_o7.par
+++ b/TestProlongate/test/test_natural_o7.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_poly_cons3lfb_o1.par b/TestProlongate/test/test_poly_cons3lfb_o1.par
index 878a1ca6b..9caa4e5bb 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o1.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_poly_cons3lfb_o3.par b/TestProlongate/test/test_poly_cons3lfb_o3.par
index ca93e5c24..d3293b058 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o3.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_poly_cons3lfb_o5.par b/TestProlongate/test/test_poly_cons3lfb_o5.par
index 6f7b465b7..a4540f577 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o5.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o5.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestSymmetries/par/test_symmetry_xnone_ynone_znone.par b/TestSymmetries/par/test_symmetry_xnone_ynone_znone.par
index 3a3063ccd..16842dd75 100644
--- a/TestSymmetries/par/test_symmetry_xnone_ynone_znone.par
+++ b/TestSymmetries/par/test_symmetry_xnone_ynone_znone.par
@@ -19,9 +19,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::reflection_x = no
 CarpetX::reflection_y = no
diff --git a/TestSymmetries/par/test_symmetry_xperiodic_yperiodic_zperiodic.par b/TestSymmetries/par/test_symmetry_xperiodic_yperiodic_zperiodic.par
index a7488aafe..8c7ebe7f1 100644
--- a/TestSymmetries/par/test_symmetry_xperiodic_yperiodic_zperiodic.par
+++ b/TestSymmetries/par/test_symmetry_xperiodic_yperiodic_zperiodic.par
@@ -19,9 +19,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::reflection_x = no
 CarpetX::reflection_y = no
diff --git a/TestSymmetries/par/test_symmetry_xreflohi_yreflohi_zreflohi.par b/TestSymmetries/par/test_symmetry_xreflohi_yreflohi_zreflohi.par
index 5399f5a2f..3acedfa42 100644
--- a/TestSymmetries/par/test_symmetry_xreflohi_yreflohi_zreflohi.par
+++ b/TestSymmetries/par/test_symmetry_xreflohi_yreflohi_zreflohi.par
@@ -19,9 +19,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::reflection_x = yes
 CarpetX::reflection_y = yes
diff --git a/WaveToyX/interface.ccl b/WaveToyX/interface.ccl
index ddfbbdb47..348f05e2b 100644
--- a/WaveToyX/interface.ccl
+++ b/WaveToyX/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: WaveToyX
 
-INHERITS: CarpetX
+INHERITS: Driver
 
 USES INCLUDE HEADER: loop_device.hxx
 USES INCLUDE HEADER: vect.hxx
diff --git a/WaveToyX/par/standing.par b/WaveToyX/par/standing.par
index 74b9c31d6..fe44c373e 100644
--- a/WaveToyX/par/standing.par
+++ b/WaveToyX/par/standing.par
@@ -13,9 +13,9 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/WaveToyX/schedule.ccl b/WaveToyX/schedule.ccl
index 5e9a4d89a..272e26a5b 100644
--- a/WaveToyX/schedule.ccl
+++ b/WaveToyX/schedule.ccl
@@ -13,14 +13,14 @@ SCHEDULE WaveToyX_Initial AT initial
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: CarpetX::regrid_error(interior)
+#   WRITES: Driver::regrid_error(interior)
 # } "Estimate error for regridding"
 # 
 # SCHEDULE WaveToyX_EstimateError AT poststep
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: CarpetX::regrid_error(interior)
+#   WRITES: Driver::regrid_error(interior)
 # } "Estimate error for regridding"
 
 SCHEDULE WaveToyX_RHS IN ODESolvers_RHS
diff --git a/WaveToyX/test/radiative/norms/carpetx-regrid_error.tsv b/WaveToyX/test/radiative/norms/driver-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/radiative/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/radiative/norms/driver-regrid_error.tsv
diff --git a/WaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv b/WaveToyX/test/reflecting/norms/driver-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/reflecting/norms/driver-regrid_error.tsv
diff --git a/WaveToyX/test/standing.par b/WaveToyX/test/standing.par
index e2b07498c..10fa3beb2 100644
--- a/WaveToyX/test/standing.par
+++ b/WaveToyX/test/standing.par
@@ -14,9 +14,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
diff --git a/WaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/WaveToyX/test/standing/norms/driver-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/standing/norms/driver-regrid_error.tsv
diff --git a/WaveToyX/test/standing2.par b/WaveToyX/test/standing2.par
index 49f7a2abe..850cb7abd 100644
--- a/WaveToyX/test/standing2.par
+++ b/WaveToyX/test/standing2.par
@@ -14,9 +14,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
diff --git a/WaveToyX/test/standing2/norms/carpetx-regrid_error.tsv b/WaveToyX/test/standing2/norms/driver-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/standing2/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/standing2/norms/driver-regrid_error.tsv

From 5949f9722af1587aa9349dd9f1244c164d8356ea Mon Sep 17 00:00:00 2001
From: "Steven R. Brandt" <sbrandt@cct.lsu.edu>
Date: Tue, 30 Jul 2024 16:16:18 -0500
Subject: [PATCH 2/3] CarpetX: Move regrid_error to a new thorn.

---
 BoxInBox/interface.ccl                        |   2 +-
 BoxInBox/schedule.ccl                         |   4 +-
 BoxInBox/test/levels1.par                     |   3 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.z.tsv} |   0
 BoxInBox/test/levels2.par                     |   3 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.z.tsv} |   0
 BoxInBox/test/levels20.par                    |   3 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.z.tsv} |   0
 BoxInBox/test/levels3.par                     |   3 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.z.tsv} |   0
 BoxInBox/test/regions2.par                    |   3 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.z.tsv} |   0
 BoxInBox/test/regions3.par                    |   3 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.z.tsv} |   0
 BoxInBox/test/unigrid.par                     |   3 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000010.z.tsv} |   0
 CarpetX/configuration.ccl                     |   2 +-
 CarpetX/interface.ccl                         |   9 --
 CarpetX/schedule.ccl                          |  10 +-
 CarpetX/src/driver.cxx                        |   2 +-
 CarpetX/src/make.code.defn                    |   1 -
 CarpetX/src/schedule.cxx                      |   4 +-
 ErrorEstimator/interface.ccl                  |   2 +-
 ErrorEstimator/schedule.ccl                   |   4 +-
 FluxWaveToyX/test/radiative.par               |   1 +
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 FluxWaveToyX/test/reflecting.par              |   1 +
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 FluxWaveToyX/test/standing.par                |   1 +
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 MovingBoxToy/par/circle.par                   |   2 +-
 MovingBoxToy/test/circle.par                  |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000000.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000001.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000001.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000001.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000002.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000002.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000002.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000003.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000003.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000003.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000004.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000004.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000004.z.tsv} |   0
 ...tsv => regrid-regrid_error.it000005.x.tsv} |   0
 ...tsv => regrid-regrid_error.it000005.y.tsv} |   0
 ...tsv => regrid-regrid_error.it000005.z.tsv} |   0
 Regrid/README                                 |  11 ++
 Regrid/configuration.ccl                      |   6 +
 Regrid/doc/documentation.tex                  | 146 ++++++++++++++++++
 Regrid/interface.ccl                          |   9 ++
 Regrid/param.ccl                              |   1 +
 Regrid/schedule.ccl                           |   6 +
 Regrid/src/make.code.defn                     |   7 +
 Regrid/src/regrid_error.cxx                   |  23 +++
 SIMDWaveToyX/test/standing.par                |   1 +
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestBoundaries/par/test_boundaries.par        |   1 +
 TestBoxInBox/test/moving.par                  |   2 +-
 TestDerivs/interface.ccl                      |   2 +-
 TestDerivs/schedule.ccl                       |   2 +-
 TestNorms/interface.ccl                       |   2 +-
 TestNorms/schedule.ccl                        |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-constant.par         |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-dp87.par             |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-euler.par            |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-rk2.par              |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-rk3.par              |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-rk4.par              |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-rkf78.par            |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-ssprk3.par           |   2 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 TestProlongate/interface.ccl                  |   2 +-
 TestProlongate/schedule.ccl                   |   4 +-
 WaveToyX/schedule.ccl                         |   4 +-
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 ...grid_error.tsv => regrid-regrid_error.tsv} |   0
 135 files changed, 263 insertions(+), 52 deletions(-)
 rename BoxInBox/test/levels1/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels1/{driver-regrid_error.it000000.x.tsv => regrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels1/{driver-regrid_error.it000000.y.tsv => regrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels1/{driver-regrid_error.it000000.z.tsv => regrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels1/{driver-regrid_error.it000010.x.tsv => regrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels1/{driver-regrid_error.it000010.y.tsv => regrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels1/{driver-regrid_error.it000010.z.tsv => regrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels2/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels2/{driver-regrid_error.it000000.x.tsv => regrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels2/{driver-regrid_error.it000000.y.tsv => regrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels2/{driver-regrid_error.it000000.z.tsv => regrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels2/{driver-regrid_error.it000010.x.tsv => regrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels2/{driver-regrid_error.it000010.y.tsv => regrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels2/{driver-regrid_error.it000010.z.tsv => regrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels20/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels20/{driver-regrid_error.it000000.x.tsv => regrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels20/{driver-regrid_error.it000000.y.tsv => regrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels20/{driver-regrid_error.it000000.z.tsv => regrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels20/{driver-regrid_error.it000010.x.tsv => regrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels20/{driver-regrid_error.it000010.y.tsv => regrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels20/{driver-regrid_error.it000010.z.tsv => regrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels3/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels3/{driver-regrid_error.it000000.x.tsv => regrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels3/{driver-regrid_error.it000000.y.tsv => regrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels3/{driver-regrid_error.it000000.z.tsv => regrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels3/{driver-regrid_error.it000010.x.tsv => regrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels3/{driver-regrid_error.it000010.y.tsv => regrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels3/{driver-regrid_error.it000010.z.tsv => regrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/regions2/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/regions2/{driver-regrid_error.it000000.x.tsv => regrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/regions2/{driver-regrid_error.it000000.y.tsv => regrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/regions2/{driver-regrid_error.it000000.z.tsv => regrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/regions2/{driver-regrid_error.it000010.x.tsv => regrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/regions2/{driver-regrid_error.it000010.y.tsv => regrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/regions2/{driver-regrid_error.it000010.z.tsv => regrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/regions3/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/regions3/{driver-regrid_error.it000000.x.tsv => regrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/regions3/{driver-regrid_error.it000000.y.tsv => regrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/regions3/{driver-regrid_error.it000000.z.tsv => regrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/regions3/{driver-regrid_error.it000010.x.tsv => regrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/regions3/{driver-regrid_error.it000010.y.tsv => regrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/regions3/{driver-regrid_error.it000010.z.tsv => regrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/unigrid/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/unigrid/{driver-regrid_error.it000000.x.tsv => regrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/unigrid/{driver-regrid_error.it000000.y.tsv => regrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/unigrid/{driver-regrid_error.it000000.z.tsv => regrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/unigrid/{driver-regrid_error.it000010.x.tsv => regrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/unigrid/{driver-regrid_error.it000010.y.tsv => regrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/unigrid/{driver-regrid_error.it000010.z.tsv => regrid-regrid_error.it000010.z.tsv} (100%)
 rename FluxWaveToyX/test/radiative/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename FluxWaveToyX/test/reflecting/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename FluxWaveToyX/test/standing/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename MovingBoxToy/test/circle/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000000.x.tsv => regrid-regrid_error.it000000.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000000.y.tsv => regrid-regrid_error.it000000.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000000.z.tsv => regrid-regrid_error.it000000.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000001.x.tsv => regrid-regrid_error.it000001.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000001.y.tsv => regrid-regrid_error.it000001.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000001.z.tsv => regrid-regrid_error.it000001.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000002.x.tsv => regrid-regrid_error.it000002.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000002.y.tsv => regrid-regrid_error.it000002.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000002.z.tsv => regrid-regrid_error.it000002.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000003.x.tsv => regrid-regrid_error.it000003.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000003.y.tsv => regrid-regrid_error.it000003.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000003.z.tsv => regrid-regrid_error.it000003.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000004.x.tsv => regrid-regrid_error.it000004.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000004.y.tsv => regrid-regrid_error.it000004.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000004.z.tsv => regrid-regrid_error.it000004.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000005.x.tsv => regrid-regrid_error.it000005.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000005.y.tsv => regrid-regrid_error.it000005.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{driver-regrid_error.it000005.z.tsv => regrid-regrid_error.it000005.z.tsv} (100%)
 create mode 100644 Regrid/README
 create mode 100644 Regrid/configuration.ccl
 create mode 100644 Regrid/doc/documentation.tex
 create mode 100644 Regrid/interface.ccl
 create mode 100644 Regrid/param.ccl
 create mode 100644 Regrid/schedule.ccl
 create mode 100644 Regrid/src/make.code.defn
 create mode 100644 Regrid/src/regrid_error.cxx
 rename SIMDWaveToyX/test/standing/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename SpacetimeWaveToyX/test/standing/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename StaggeredWaveToyX/test/standing/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestNorms/test/norms/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-constant/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-dp87/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-euler/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk2/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk3/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk4/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rkf78/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-ssprk3/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/radiative/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/reflecting/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/standing/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/standing2/norms/{driver-regrid_error.tsv => regrid-regrid_error.tsv} (100%)

diff --git a/BoxInBox/interface.ccl b/BoxInBox/interface.ccl
index acb099e21..1c0e5e116 100644
--- a/BoxInBox/interface.ccl
+++ b/BoxInBox/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: BoxInBox
 
-INHERITS: Driver
+INHERITS: Driver, Regrid
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/BoxInBox/schedule.ccl b/BoxInBox/schedule.ccl
index 3471f03b7..b38dc05b3 100644
--- a/BoxInBox/schedule.ccl
+++ b/BoxInBox/schedule.ccl
@@ -19,7 +19,7 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT postinitial
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: Driver::regrid_error(interior)
+  WRITES: Regrid::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
@@ -30,5 +30,5 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: Driver::regrid_error(interior)
+  WRITES: Regrid::regrid_error(interior)
 } "Estimate error"
diff --git a/BoxInBox/test/levels1.par b/BoxInBox/test/levels1.par
index 5ae262e1a..319cf4d76 100644
--- a/BoxInBox/test/levels1.par
+++ b/BoxInBox/test/levels1.par
@@ -3,6 +3,7 @@ ActiveThorns = "
     CarpetX
     CoordinatesX
     IOUtil
+    Regrid
 "
 
 Cactus::cctk_show_schedule = no
@@ -38,7 +39,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels1/norms/driver-regrid_error.tsv b/BoxInBox/test/levels1/norms/regrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels1/norms/driver-regrid_error.tsv
rename to BoxInBox/test/levels1/norms/regrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels1/driver-regrid_error.it000000.x.tsv b/BoxInBox/test/levels1/regrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels1/driver-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels1/regrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels1/driver-regrid_error.it000000.y.tsv b/BoxInBox/test/levels1/regrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels1/driver-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels1/regrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels1/driver-regrid_error.it000000.z.tsv b/BoxInBox/test/levels1/regrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels1/driver-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels1/regrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels1/driver-regrid_error.it000010.x.tsv b/BoxInBox/test/levels1/regrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels1/driver-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels1/regrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels1/driver-regrid_error.it000010.y.tsv b/BoxInBox/test/levels1/regrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels1/driver-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels1/regrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels1/driver-regrid_error.it000010.z.tsv b/BoxInBox/test/levels1/regrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels1/driver-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels1/regrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels2.par b/BoxInBox/test/levels2.par
index 0ebd18571..0160f4b34 100644
--- a/BoxInBox/test/levels2.par
+++ b/BoxInBox/test/levels2.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -39,7 +40,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels2/norms/driver-regrid_error.tsv b/BoxInBox/test/levels2/norms/regrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels2/norms/driver-regrid_error.tsv
rename to BoxInBox/test/levels2/norms/regrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels2/driver-regrid_error.it000000.x.tsv b/BoxInBox/test/levels2/regrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels2/driver-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels2/regrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels2/driver-regrid_error.it000000.y.tsv b/BoxInBox/test/levels2/regrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels2/driver-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels2/regrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels2/driver-regrid_error.it000000.z.tsv b/BoxInBox/test/levels2/regrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels2/driver-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels2/regrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels2/driver-regrid_error.it000010.x.tsv b/BoxInBox/test/levels2/regrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels2/driver-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels2/regrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels2/driver-regrid_error.it000010.y.tsv b/BoxInBox/test/levels2/regrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels2/driver-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels2/regrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels2/driver-regrid_error.it000010.z.tsv b/BoxInBox/test/levels2/regrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels2/driver-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels2/regrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels20.par b/BoxInBox/test/levels20.par
index 0b56ed1ef..cf3eefed2 100644
--- a/BoxInBox/test/levels20.par
+++ b/BoxInBox/test/levels20.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -57,7 +58,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels20/norms/driver-regrid_error.tsv b/BoxInBox/test/levels20/norms/regrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels20/norms/driver-regrid_error.tsv
rename to BoxInBox/test/levels20/norms/regrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels20/driver-regrid_error.it000000.x.tsv b/BoxInBox/test/levels20/regrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels20/driver-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels20/regrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels20/driver-regrid_error.it000000.y.tsv b/BoxInBox/test/levels20/regrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels20/driver-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels20/regrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels20/driver-regrid_error.it000000.z.tsv b/BoxInBox/test/levels20/regrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels20/driver-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels20/regrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels20/driver-regrid_error.it000010.x.tsv b/BoxInBox/test/levels20/regrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels20/driver-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels20/regrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels20/driver-regrid_error.it000010.y.tsv b/BoxInBox/test/levels20/regrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels20/driver-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels20/regrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels20/driver-regrid_error.it000010.z.tsv b/BoxInBox/test/levels20/regrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels20/driver-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels20/regrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels3.par b/BoxInBox/test/levels3.par
index ba7f66089..afdc352dd 100644
--- a/BoxInBox/test/levels3.par
+++ b/BoxInBox/test/levels3.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -40,7 +41,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels3/norms/driver-regrid_error.tsv b/BoxInBox/test/levels3/norms/regrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels3/norms/driver-regrid_error.tsv
rename to BoxInBox/test/levels3/norms/regrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels3/driver-regrid_error.it000000.x.tsv b/BoxInBox/test/levels3/regrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels3/driver-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels3/regrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels3/driver-regrid_error.it000000.y.tsv b/BoxInBox/test/levels3/regrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels3/driver-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels3/regrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels3/driver-regrid_error.it000000.z.tsv b/BoxInBox/test/levels3/regrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels3/driver-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels3/regrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels3/driver-regrid_error.it000010.x.tsv b/BoxInBox/test/levels3/regrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels3/driver-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels3/regrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels3/driver-regrid_error.it000010.y.tsv b/BoxInBox/test/levels3/regrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels3/driver-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels3/regrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels3/driver-regrid_error.it000010.z.tsv b/BoxInBox/test/levels3/regrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels3/driver-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels3/regrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/regions2.par b/BoxInBox/test/regions2.par
index 04d7570ab..a38342145 100644
--- a/BoxInBox/test/regions2.par
+++ b/BoxInBox/test/regions2.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -49,7 +50,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/regions2/norms/driver-regrid_error.tsv b/BoxInBox/test/regions2/norms/regrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/regions2/norms/driver-regrid_error.tsv
rename to BoxInBox/test/regions2/norms/regrid-regrid_error.tsv
diff --git a/BoxInBox/test/regions2/driver-regrid_error.it000000.x.tsv b/BoxInBox/test/regions2/regrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/regions2/driver-regrid_error.it000000.x.tsv
rename to BoxInBox/test/regions2/regrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/regions2/driver-regrid_error.it000000.y.tsv b/BoxInBox/test/regions2/regrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/regions2/driver-regrid_error.it000000.y.tsv
rename to BoxInBox/test/regions2/regrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/regions2/driver-regrid_error.it000000.z.tsv b/BoxInBox/test/regions2/regrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/regions2/driver-regrid_error.it000000.z.tsv
rename to BoxInBox/test/regions2/regrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/regions2/driver-regrid_error.it000010.x.tsv b/BoxInBox/test/regions2/regrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/regions2/driver-regrid_error.it000010.x.tsv
rename to BoxInBox/test/regions2/regrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/regions2/driver-regrid_error.it000010.y.tsv b/BoxInBox/test/regions2/regrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/regions2/driver-regrid_error.it000010.y.tsv
rename to BoxInBox/test/regions2/regrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/regions2/driver-regrid_error.it000010.z.tsv b/BoxInBox/test/regions2/regrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/regions2/driver-regrid_error.it000010.z.tsv
rename to BoxInBox/test/regions2/regrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/regions3.par b/BoxInBox/test/regions3.par
index fa1810b00..7b191dbc5 100644
--- a/BoxInBox/test/regions3.par
+++ b/BoxInBox/test/regions3.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -60,7 +61,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/regions3/norms/driver-regrid_error.tsv b/BoxInBox/test/regions3/norms/regrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/regions3/norms/driver-regrid_error.tsv
rename to BoxInBox/test/regions3/norms/regrid-regrid_error.tsv
diff --git a/BoxInBox/test/regions3/driver-regrid_error.it000000.x.tsv b/BoxInBox/test/regions3/regrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/regions3/driver-regrid_error.it000000.x.tsv
rename to BoxInBox/test/regions3/regrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/regions3/driver-regrid_error.it000000.y.tsv b/BoxInBox/test/regions3/regrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/regions3/driver-regrid_error.it000000.y.tsv
rename to BoxInBox/test/regions3/regrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/regions3/driver-regrid_error.it000000.z.tsv b/BoxInBox/test/regions3/regrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/regions3/driver-regrid_error.it000000.z.tsv
rename to BoxInBox/test/regions3/regrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/regions3/driver-regrid_error.it000010.x.tsv b/BoxInBox/test/regions3/regrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/regions3/driver-regrid_error.it000010.x.tsv
rename to BoxInBox/test/regions3/regrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/regions3/driver-regrid_error.it000010.y.tsv b/BoxInBox/test/regions3/regrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/regions3/driver-regrid_error.it000010.y.tsv
rename to BoxInBox/test/regions3/regrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/regions3/driver-regrid_error.it000010.z.tsv b/BoxInBox/test/regions3/regrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/regions3/driver-regrid_error.it000010.z.tsv
rename to BoxInBox/test/regions3/regrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/unigrid.par b/BoxInBox/test/unigrid.par
index f90231382..b2fc44e08 100644
--- a/BoxInBox/test/unigrid.par
+++ b/BoxInBox/test/unigrid.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -37,7 +38,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/unigrid/norms/driver-regrid_error.tsv b/BoxInBox/test/unigrid/norms/regrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/norms/driver-regrid_error.tsv
rename to BoxInBox/test/unigrid/norms/regrid-regrid_error.tsv
diff --git a/BoxInBox/test/unigrid/driver-regrid_error.it000000.x.tsv b/BoxInBox/test/unigrid/regrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/driver-regrid_error.it000000.x.tsv
rename to BoxInBox/test/unigrid/regrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/unigrid/driver-regrid_error.it000000.y.tsv b/BoxInBox/test/unigrid/regrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/driver-regrid_error.it000000.y.tsv
rename to BoxInBox/test/unigrid/regrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/unigrid/driver-regrid_error.it000000.z.tsv b/BoxInBox/test/unigrid/regrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/driver-regrid_error.it000000.z.tsv
rename to BoxInBox/test/unigrid/regrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/unigrid/driver-regrid_error.it000010.x.tsv b/BoxInBox/test/unigrid/regrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/driver-regrid_error.it000010.x.tsv
rename to BoxInBox/test/unigrid/regrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/unigrid/driver-regrid_error.it000010.y.tsv b/BoxInBox/test/unigrid/regrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/driver-regrid_error.it000010.y.tsv
rename to BoxInBox/test/unigrid/regrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/unigrid/driver-regrid_error.it000010.z.tsv b/BoxInBox/test/unigrid/regrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/driver-regrid_error.it000010.z.tsv
rename to BoxInBox/test/unigrid/regrid-regrid_error.it000010.z.tsv
diff --git a/CarpetX/configuration.ccl b/CarpetX/configuration.ccl
index 5db400799..5b1eb7661 100644
--- a/CarpetX/configuration.ccl
+++ b/CarpetX/configuration.ccl
@@ -2,7 +2,7 @@
 
 REQUIRES AMReX IOUtil MPI yaml_cpp zlib
 
-REQUIRES Arith Loop
+REQUIRES Arith Loop Regrid
 
 OPTIONAL ADIOS2
 {
diff --git a/CarpetX/interface.ccl b/CarpetX/interface.ccl
index ea60a4d20..e46ccd724 100644
--- a/CarpetX/interface.ccl
+++ b/CarpetX/interface.ccl
@@ -166,12 +166,3 @@ CCTK_INT FUNCTION DriverInterpolate(
   CCTK_INT ARRAY IN output_array_types,
   CCTK_POINTER ARRAY IN output_arrays)
 PROVIDES FUNCTION DriverInterpolate WITH CarpetX_DriverInterpolate LANGUAGE C
-
-
-
-PUBLIC:
-
-CCTK_REAL regrid_error TYPE=gf dim=default_dim CENTERING={ccc} TAGS='checkpoint="no"'
-{
-  regrid_error
-} "Regridding condition"
diff --git a/CarpetX/schedule.ccl b/CarpetX/schedule.ccl
index ef1e29a6d..a2b111960 100644
--- a/CarpetX/schedule.ccl
+++ b/CarpetX/schedule.ccl
@@ -22,11 +22,11 @@ if (!CCTK_Equals(recover, "no") && *recover_file)
 
 # Error estimation
 
-SCHEDULE CarpetX_InitError AT basegrid
-{
-  LANG: C
-  WRITES: regrid_error(everywhere)
-} "Initialize regridding error to zero"
+#SCHEDULE CarpetX_InitError AT basegrid
+#{
+#  LANG: C
+#  WRITES: Regrid::regrid_error(everywhere)
+#} "Initialize regridding error to zero"
 
 
 
diff --git a/CarpetX/src/driver.cxx b/CarpetX/src/driver.cxx
index 0ea07d784..92890590a 100644
--- a/CarpetX/src/driver.cxx
+++ b/CarpetX/src/driver.cxx
@@ -1534,7 +1534,7 @@ void CactusAmrCore::ErrorEst(const int level, amrex::TagBoxArray &tags,
 #pragma omp critical
     CCTK_VINFO("ErrorEst patch %d level %d", patch, level);
 
-  const int gi = CCTK_GroupIndex("Driver::regrid_error");
+  const int gi = CCTK_GroupIndex("Regrid::regrid_error");
   assert(gi >= 0);
   const int vi = 0;
   const int tl = 0;
diff --git a/CarpetX/src/make.code.defn b/CarpetX/src/make.code.defn
index 730d5bb82..8ca0b1521 100644
--- a/CarpetX/src/make.code.defn
+++ b/CarpetX/src/make.code.defn
@@ -51,7 +51,6 @@ SRCS =							\
 	prolongate_3d_rf2_impl_poly.cxx			\
 	prolongate_3d_rf2_impl_poly_cons3lfb.cxx	\
 	reduction.cxx					\
-	regrid_error.cxx				\
 	schedule.cxx					\
 	task_manager.cxx				\
 	timer.cxx					\
diff --git a/CarpetX/src/schedule.cxx b/CarpetX/src/schedule.cxx
index 8ff563e80..cd5e33d13 100644
--- a/CarpetX/src/schedule.cxx
+++ b/CarpetX/src/schedule.cxx
@@ -2240,7 +2240,7 @@ int SyncGroupsByDirI(const cGH *restrict cctkGH, int numgroups,
     CCTK_VINFO("SyncGroups %s", buf.str().c_str());
   }
 
-  const int gi_regrid_error = CCTK_GroupIndex("Driver::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("Regrid::regrid_error");
   assert(gi_regrid_error >= 0);
 
   vector<int> groups;
@@ -2621,7 +2621,7 @@ void Restrict(const cGH *cctkGH, int level, const vector<int> &groups) {
   static Timer timer("Restrict");
   Interval interval(timer);
 
-  const int gi_regrid_error = CCTK_GroupIndex("Driver::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("Regrid::regrid_error");
   assert(gi_regrid_error >= 0);
 
   for (const auto &patchdata : ghext->patchdata) {
diff --git a/ErrorEstimator/interface.ccl b/ErrorEstimator/interface.ccl
index f0fd3693e..619ffa2ca 100644
--- a/ErrorEstimator/interface.ccl
+++ b/ErrorEstimator/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: ErrorEstimator
 
-INHERITS: Driver
+INHERITS: Driver, Regrid
 
 
 
diff --git a/ErrorEstimator/schedule.ccl b/ErrorEstimator/schedule.ccl
index 12e797196..c2e867234 100644
--- a/ErrorEstimator/schedule.ccl
+++ b/ErrorEstimator/schedule.ccl
@@ -5,11 +5,11 @@
 SCHEDULE ErrorEstimator_Estimate AS EstimateError AT postinitial
 {
   LANG: C
-  WRITES: Driver::regrid_error(interior)
+  WRITES: Regrid::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE ErrorEstimator_Estimate AS EstimateError AT poststep
 {
   LANG: C
-  WRITES: Driver::regrid_error(interior)
+  WRITES: Regrid::regrid_error(interior)
 } "Estimate error"
diff --git a/FluxWaveToyX/test/radiative.par b/FluxWaveToyX/test/radiative.par
index 4b5cf736c..1b43bfe92 100644
--- a/FluxWaveToyX/test/radiative.par
+++ b/FluxWaveToyX/test/radiative.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    Regrid
     FluxWaveToyX
     IOUtil
     ODESolvers
diff --git a/FluxWaveToyX/test/radiative/norms/driver-regrid_error.tsv b/FluxWaveToyX/test/radiative/norms/regrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/radiative/norms/driver-regrid_error.tsv
rename to FluxWaveToyX/test/radiative/norms/regrid-regrid_error.tsv
diff --git a/FluxWaveToyX/test/reflecting.par b/FluxWaveToyX/test/reflecting.par
index 6018bbe6c..bbefdaa5e 100644
--- a/FluxWaveToyX/test/reflecting.par
+++ b/FluxWaveToyX/test/reflecting.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    Regrid
     FluxWaveToyX
     IOUtil
     ODESolvers
diff --git a/FluxWaveToyX/test/reflecting/norms/driver-regrid_error.tsv b/FluxWaveToyX/test/reflecting/norms/regrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/reflecting/norms/driver-regrid_error.tsv
rename to FluxWaveToyX/test/reflecting/norms/regrid-regrid_error.tsv
diff --git a/FluxWaveToyX/test/standing.par b/FluxWaveToyX/test/standing.par
index e071a07c0..7c388880d 100644
--- a/FluxWaveToyX/test/standing.par
+++ b/FluxWaveToyX/test/standing.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    Regrid
     FluxWaveToyX
     IOUtil
     ODESolvers
diff --git a/FluxWaveToyX/test/standing/norms/driver-regrid_error.tsv b/FluxWaveToyX/test/standing/norms/regrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/standing/norms/driver-regrid_error.tsv
rename to FluxWaveToyX/test/standing/norms/regrid-regrid_error.tsv
diff --git a/MovingBoxToy/par/circle.par b/MovingBoxToy/par/circle.par
index df8345e88..6370d7b57 100644
--- a/MovingBoxToy/par/circle.par
+++ b/MovingBoxToy/par/circle.par
@@ -52,7 +52,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_silo_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/MovingBoxToy/test/circle.par b/MovingBoxToy/test/circle.par
index 2cf02d40f..b67358733 100644
--- a/MovingBoxToy/test/circle.par
+++ b/MovingBoxToy/test/circle.par
@@ -52,7 +52,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/MovingBoxToy/test/circle/norms/driver-regrid_error.tsv b/MovingBoxToy/test/circle/norms/regrid-regrid_error.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/norms/driver-regrid_error.tsv
rename to MovingBoxToy/test/circle/norms/regrid-regrid_error.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000000.x.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000000.x.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000000.x.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000000.y.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000000.y.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000000.y.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000000.z.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000000.z.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000000.z.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000001.x.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000001.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000001.x.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000001.x.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000001.y.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000001.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000001.y.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000001.y.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000001.z.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000001.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000001.z.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000001.z.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000002.x.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000002.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000002.x.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000002.x.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000002.y.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000002.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000002.y.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000002.y.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000002.z.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000002.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000002.z.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000002.z.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000003.x.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000003.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000003.x.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000003.x.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000003.y.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000003.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000003.y.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000003.y.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000003.z.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000003.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000003.z.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000003.z.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000004.x.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000004.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000004.x.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000004.x.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000004.y.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000004.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000004.y.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000004.y.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000004.z.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000004.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000004.z.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000004.z.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000005.x.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000005.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000005.x.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000005.x.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000005.y.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000005.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000005.y.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000005.y.tsv
diff --git a/MovingBoxToy/test/circle/driver-regrid_error.it000005.z.tsv b/MovingBoxToy/test/circle/regrid-regrid_error.it000005.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/driver-regrid_error.it000005.z.tsv
rename to MovingBoxToy/test/circle/regrid-regrid_error.it000005.z.tsv
diff --git a/Regrid/README b/Regrid/README
new file mode 100644
index 000000000..b915a12ae
--- /dev/null
+++ b/Regrid/README
@@ -0,0 +1,11 @@
+Cactus Code Thorn Regrid
+Author(s)    : Steven R. Brandt <sbrandt@cct.lsu.edu>
+Maintainer(s): Steven R. Brandt <sbrandt@cct.lsu.edu>
+Licence      : Cactus
+--------------------------------------------------------------------------
+
+1. Purpose
+
+Provide an extra grid function, "regrid_error," to the CarpetX driver.
+This grid function is used by CarpetX and AMReX to determine where to
+refine the grid.
diff --git a/Regrid/configuration.ccl b/Regrid/configuration.ccl
new file mode 100644
index 000000000..88358645e
--- /dev/null
+++ b/Regrid/configuration.ccl
@@ -0,0 +1,6 @@
+# Configuration definitions for thorn Regrid
+REQUIRES AMReX Arith Loop 
+
+PROVIDES Regrid
+{
+}
diff --git a/Regrid/doc/documentation.tex b/Regrid/doc/documentation.tex
new file mode 100644
index 000000000..3cb3f16b1
--- /dev/null
+++ b/Regrid/doc/documentation.tex
@@ -0,0 +1,146 @@
+% *======================================================================*
+%  Cactus Thorn template for ThornGuide documentation
+%  Author: Ian Kelley
+%  Date: Sun Jun 02, 2002
+%  $Header$
+%
+%  Thorn documentation in the latex file doc/documentation.tex
+%  will be included in ThornGuides built with the Cactus make system.
+%  The scripts employed by the make system automatically include
+%  pages about variables, parameters and scheduling parsed from the
+%  relevant thorn CCL files.
+%
+%  This template contains guidelines which help to assure that your
+%  documentation will be correctly added to ThornGuides. More
+%  information is available in the Cactus UsersGuide.
+%
+%  Guidelines:
+%   - Do not change anything before the line
+%       % START CACTUS THORNGUIDE",
+%     except for filling in the title, author, date, etc. fields.
+%        - Each of these fields should only be on ONE line.
+%        - Author names should be separated with a \\ or a comma.
+%   - You can define your own macros, but they must appear after
+%     the START CACTUS THORNGUIDE line, and must not redefine standard
+%     latex commands.
+%   - To avoid name clashes with other thorns, 'labels', 'citations',
+%     'references', and 'image' names should conform to the following
+%     convention:
+%       ARRANGEMENT_THORN_LABEL
+%     For example, an image wave.eps in the arrangement CactusWave and
+%     thorn WaveToyC should be renamed to CactusWave_WaveToyC_wave.eps
+%   - Graphics should only be included using the graphicx package.
+%     More specifically, with the "\includegraphics" command.  Do
+%     not specify any graphic file extensions in your .tex file. This
+%     will allow us to create a PDF version of the ThornGuide
+%     via pdflatex.
+%   - References should be included with the latex "\bibitem" command.
+%   - Use \begin{abstract}...\end{abstract} instead of \abstract{...}
+%   - Do not use \appendix, instead include any appendices you need as
+%     standard sections.
+%   - For the benefit of our Perl scripts, and for future extensions,
+%     please use simple latex.
+%
+% *======================================================================*
+%
+% Example of including a graphic image:
+%    \begin{figure}[ht]
+% 	\begin{center}
+%    	   \includegraphics[width=6cm]{MyArrangement_MyThorn_MyFigure}
+% 	\end{center}
+% 	\caption{Illustration of this and that}
+% 	\label{MyArrangement_MyThorn_MyLabel}
+%    \end{figure}
+%
+% Example of using a label:
+%   \label{MyArrangement_MyThorn_MyLabel}
+%
+% Example of a citation:
+%    \cite{MyArrangement_MyThorn_Author99}
+%
+% Example of including a reference
+%   \bibitem{MyArrangement_MyThorn_Author99}
+%   {J. Author, {\em The Title of the Book, Journal, or periodical}, 1 (1999),
+%   1--16. {\tt http://www.nowhere.com/}}
+%
+% *======================================================================*
+
+% If you are using CVS use this line to give version information
+% $Header$
+
+\documentclass{article}
+
+% Use the Cactus ThornGuide style file
+% (Automatically used from Cactus distribution, if you have a
+%  thorn without the Cactus Flesh download this from the Cactus
+%  homepage at www.cactuscode.org)
+\usepackage{../../../../doc/latex/cactus}
+
+\begin{document}
+
+% The author of the documentation
+\author{Steven R. Brandt \textless sbrandt@cct.lsu.edu\textgreater}
+
+% The title of the document (not necessarily the name of the Thorn)
+\title{Regrid}
+
+% the date your document was last changed, if your document is in CVS,
+% please use:
+%    \date{$ $Date$ $}
+% when using git instead record the commit ID:
+%    \date{\gitrevision{<path-to-your-.git-directory>}}
+\date{July 30 2024}
+
+\maketitle
+
+% Do not delete next line
+% START CACTUS THORNGUIDE
+
+% Add all definitions used in this documentation here
+%   \def\mydef etc
+
+% Add an abstract for this thorn's documentation
+\begin{abstract}
+
+\end{abstract}
+
+% The following sections are suggestive only.
+% Remove them or add your own.
+
+\section{Introduction}
+
+\section{Physical System}
+
+\section{Numerical Implementation}
+
+\section{Using This Thorn}
+
+\subsection{Obtaining This Thorn}
+
+\subsection{Basic Usage}
+
+\subsection{Special Behaviour}
+
+\subsection{Interaction With Other Thorns}
+
+\subsection{Examples}
+
+\subsection{Support and Feedback}
+
+\section{History}
+
+\subsection{Thorn Source Code}
+
+\subsection{Thorn Documentation}
+
+\subsection{Acknowledgements}
+
+
+\begin{thebibliography}{9}
+
+\end{thebibliography}
+
+% Do not delete next line
+% END CACTUS THORNGUIDE
+
+\end{document}
diff --git a/Regrid/interface.ccl b/Regrid/interface.ccl
new file mode 100644
index 000000000..b54f24cba
--- /dev/null
+++ b/Regrid/interface.ccl
@@ -0,0 +1,9 @@
+# Interface definition for thorn Regrid
+implements: Regrid
+inherits:
+PUBLIC:
+
+CCTK_REAL regrid_error TYPE=gf CENTERING={ccc} TAGS='checkpoint="no"'
+{
+  regrid_error
+} "Regridding condition"
diff --git a/Regrid/param.ccl b/Regrid/param.ccl
new file mode 100644
index 000000000..5cc740a31
--- /dev/null
+++ b/Regrid/param.ccl
@@ -0,0 +1 @@
+# Parameter definitions for thorn Regrid
diff --git a/Regrid/schedule.ccl b/Regrid/schedule.ccl
new file mode 100644
index 000000000..876f43ff1
--- /dev/null
+++ b/Regrid/schedule.ccl
@@ -0,0 +1,6 @@
+# Schedule definitions for thorn Regrid
+SCHEDULE CarpetX_InitError AT basegrid
+{
+  LANG: C
+  WRITES: Regrid::regrid_error(everywhere)
+} "Initialize regridding error to zero"
diff --git a/Regrid/src/make.code.defn b/Regrid/src/make.code.defn
new file mode 100644
index 000000000..d1bfa033c
--- /dev/null
+++ b/Regrid/src/make.code.defn
@@ -0,0 +1,7 @@
+# Main make.code.defn file for thorn Regrid
+
+# Source files in this directory
+SRCS = regrid_error.cxx
+
+# Subdirectories containing source files
+SUBDIRS = 
diff --git a/Regrid/src/regrid_error.cxx b/Regrid/src/regrid_error.cxx
new file mode 100644
index 000000000..eee9fc5bf
--- /dev/null
+++ b/Regrid/src/regrid_error.cxx
@@ -0,0 +1,23 @@
+//#include "schedule.hxx"
+
+#include <loop.hxx>
+#include <loop_device.hxx>
+
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
+
+namespace CarpetX {
+using namespace std;
+
+extern "C" void CarpetX_InitError(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTSX_CarpetX_InitError;
+  DECLARE_CCTK_PARAMETERS;
+
+  grid.loop_device<1, 1, 1, Loop::where_t::everywhere>(
+      grid.nghostzones,
+      [=] CCTK_DEVICE(const Loop::PointDesc &p)
+          CCTK_ATTRIBUTE_ALWAYS_INLINE { regrid_error(p.I) = 0; });
+}
+
+} // namespace CarpetX
diff --git a/SIMDWaveToyX/test/standing.par b/SIMDWaveToyX/test/standing.par
index bb3a4fde4..8dc4e701e 100644
--- a/SIMDWaveToyX/test/standing.par
+++ b/SIMDWaveToyX/test/standing.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    Regrid
     IOUtil
     ODESolvers
     SIMDWaveToyX
diff --git a/SIMDWaveToyX/test/standing/norms/driver-regrid_error.tsv b/SIMDWaveToyX/test/standing/norms/regrid-regrid_error.tsv
similarity index 100%
rename from SIMDWaveToyX/test/standing/norms/driver-regrid_error.tsv
rename to SIMDWaveToyX/test/standing/norms/regrid-regrid_error.tsv
diff --git a/SpacetimeWaveToyX/test/standing/norms/driver-regrid_error.tsv b/SpacetimeWaveToyX/test/standing/norms/regrid-regrid_error.tsv
similarity index 100%
rename from SpacetimeWaveToyX/test/standing/norms/driver-regrid_error.tsv
rename to SpacetimeWaveToyX/test/standing/norms/regrid-regrid_error.tsv
diff --git a/StaggeredWaveToyX/test/standing/norms/driver-regrid_error.tsv b/StaggeredWaveToyX/test/standing/norms/regrid-regrid_error.tsv
similarity index 100%
rename from StaggeredWaveToyX/test/standing/norms/driver-regrid_error.tsv
rename to StaggeredWaveToyX/test/standing/norms/regrid-regrid_error.tsv
diff --git a/TestBoundaries/par/test_boundaries.par b/TestBoundaries/par/test_boundaries.par
index 4c1b16c20..96c3f7f2c 100644
--- a/TestBoundaries/par/test_boundaries.par
+++ b/TestBoundaries/par/test_boundaries.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    Regrid
     IOUtil
     TestBoundaries
 "
diff --git a/TestBoxInBox/test/moving.par b/TestBoxInBox/test/moving.par
index 8d7c56329..7115aac76 100644
--- a/TestBoxInBox/test/moving.par
+++ b/TestBoxInBox/test/moving.par
@@ -40,7 +40,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/TestDerivs/interface.ccl b/TestDerivs/interface.ccl
index c176732af..350916f75 100644
--- a/TestDerivs/interface.ccl
+++ b/TestDerivs/interface.ccl
@@ -1,7 +1,7 @@
 # Interface definition for thorn TestDerivs
 IMPLEMENTS: TestDerivs
 
-INHERITS: Driver
+INHERITS: Driver, Regrid
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/TestDerivs/schedule.ccl b/TestDerivs/schedule.ccl
index 9252af71d..221a990cb 100644
--- a/TestDerivs/schedule.ccl
+++ b/TestDerivs/schedule.ccl
@@ -7,7 +7,7 @@ STORAGE: ddchi
 SCHEDULE TestDerivs_SetError AT postinitial
 {
   LANG: C
-  WRITES: Driver::regrid_error(interior)
+  WRITES: Regrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestDerivs_Set AT initial
diff --git a/TestNorms/interface.ccl b/TestNorms/interface.ccl
index 56f7648b2..fa7cfce93 100644
--- a/TestNorms/interface.ccl
+++ b/TestNorms/interface.ccl
@@ -1,6 +1,6 @@
 # Interface definition for thorn TestNorms
 implements: TestNorms
-inherits: Driver
+inherits: Driver, Regrid
 
 uses include header: loop.hxx
 
diff --git a/TestNorms/schedule.ccl b/TestNorms/schedule.ccl
index 370259897..99238a884 100644
--- a/TestNorms/schedule.ccl
+++ b/TestNorms/schedule.ccl
@@ -12,7 +12,7 @@ STORAGE: gf111
 SCHEDULE TestNorms_SetError AT postinitial
 {
   LANG: C
-  WRITES: Driver::regrid_error(interior)
+  WRITES: Regrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestNorms_Set AT initial
diff --git a/TestNorms/test/norms/norms/driver-regrid_error.tsv b/TestNorms/test/norms/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestNorms/test/norms/norms/driver-regrid_error.tsv
rename to TestNorms/test/norms/norms/regrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-constant.par b/TestODESolvers/test/test-constant.par
index f57cf6120..db2442553 100644
--- a/TestODESolvers/test/test-constant.par
+++ b/TestODESolvers/test/test-constant.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-constant/norms/driver-regrid_error.tsv b/TestODESolvers/test/test-constant/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-constant/norms/driver-regrid_error.tsv
rename to TestODESolvers/test/test-constant/norms/regrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-dp87.par b/TestODESolvers/test/test-dp87.par
index 3ae0fc57e..a000668ef 100644
--- a/TestODESolvers/test/test-dp87.par
+++ b/TestODESolvers/test/test-dp87.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-dp87/norms/driver-regrid_error.tsv b/TestODESolvers/test/test-dp87/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-dp87/norms/driver-regrid_error.tsv
rename to TestODESolvers/test/test-dp87/norms/regrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-euler.par b/TestODESolvers/test/test-euler.par
index e0e104523..04aa07067 100644
--- a/TestODESolvers/test/test-euler.par
+++ b/TestODESolvers/test/test-euler.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-euler/norms/driver-regrid_error.tsv b/TestODESolvers/test/test-euler/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-euler/norms/driver-regrid_error.tsv
rename to TestODESolvers/test/test-euler/norms/regrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk2.par b/TestODESolvers/test/test-rk2.par
index 7cf32e91e..afa7f67fc 100644
--- a/TestODESolvers/test/test-rk2.par
+++ b/TestODESolvers/test/test-rk2.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk2/norms/driver-regrid_error.tsv b/TestODESolvers/test/test-rk2/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk2/norms/driver-regrid_error.tsv
rename to TestODESolvers/test/test-rk2/norms/regrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk3.par b/TestODESolvers/test/test-rk3.par
index e405c3bb2..58438cab3 100644
--- a/TestODESolvers/test/test-rk3.par
+++ b/TestODESolvers/test/test-rk3.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk3/norms/driver-regrid_error.tsv b/TestODESolvers/test/test-rk3/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk3/norms/driver-regrid_error.tsv
rename to TestODESolvers/test/test-rk3/norms/regrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk4.par b/TestODESolvers/test/test-rk4.par
index f05091f93..996577dfa 100644
--- a/TestODESolvers/test/test-rk4.par
+++ b/TestODESolvers/test/test-rk4.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk4/norms/driver-regrid_error.tsv b/TestODESolvers/test/test-rk4/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk4/norms/driver-regrid_error.tsv
rename to TestODESolvers/test/test-rk4/norms/regrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rkf78.par b/TestODESolvers/test/test-rkf78.par
index e95bb5410..3ddd435a0 100644
--- a/TestODESolvers/test/test-rkf78.par
+++ b/TestODESolvers/test/test-rkf78.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rkf78/norms/driver-regrid_error.tsv b/TestODESolvers/test/test-rkf78/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rkf78/norms/driver-regrid_error.tsv
rename to TestODESolvers/test/test-rkf78/norms/regrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-ssprk3.par b/TestODESolvers/test/test-ssprk3.par
index be4ee11db..a74825ad3 100644
--- a/TestODESolvers/test/test-ssprk3.par
+++ b/TestODESolvers/test/test-ssprk3.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Driver::regrid_error
+    Regrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-ssprk3/norms/driver-regrid_error.tsv b/TestODESolvers/test/test-ssprk3/norms/regrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-ssprk3/norms/driver-regrid_error.tsv
rename to TestODESolvers/test/test-ssprk3/norms/regrid-regrid_error.tsv
diff --git a/TestProlongate/interface.ccl b/TestProlongate/interface.ccl
index ab93a2448..9157ff01d 100644
--- a/TestProlongate/interface.ccl
+++ b/TestProlongate/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: TestProlongate
 
-INHERITS: Driver
+INHERITS: Driver, Regrid
 
 USES INCLUDE HEADER: loop.hxx
 
diff --git a/TestProlongate/schedule.ccl b/TestProlongate/schedule.ccl
index f37cce6be..986b138cc 100644
--- a/TestProlongate/schedule.ccl
+++ b/TestProlongate/schedule.ccl
@@ -50,13 +50,13 @@ STORAGE: gf111_sum_count
 SCHEDULE TestProlongate_Regrid AT postinitial
 {
   LANG: C
-  WRITES: Driver::regrid_error(interior)
+  WRITES: Regrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestProlongate_Regrid AT poststep
 {
   LANG: C
-  WRITES: Driver::regrid_error(interior)
+  WRITES: Regrid::regrid_error(interior)
 } "Set up test grid"
 
 
diff --git a/WaveToyX/schedule.ccl b/WaveToyX/schedule.ccl
index 272e26a5b..d29cd6f45 100644
--- a/WaveToyX/schedule.ccl
+++ b/WaveToyX/schedule.ccl
@@ -13,14 +13,14 @@ SCHEDULE WaveToyX_Initial AT initial
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: Driver::regrid_error(interior)
+#   WRITES: Regrid::regrid_error(interior)
 # } "Estimate error for regridding"
 # 
 # SCHEDULE WaveToyX_EstimateError AT poststep
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: Driver::regrid_error(interior)
+#   WRITES: Regrid::regrid_error(interior)
 # } "Estimate error for regridding"
 
 SCHEDULE WaveToyX_RHS IN ODESolvers_RHS
diff --git a/WaveToyX/test/radiative/norms/driver-regrid_error.tsv b/WaveToyX/test/radiative/norms/regrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/radiative/norms/driver-regrid_error.tsv
rename to WaveToyX/test/radiative/norms/regrid-regrid_error.tsv
diff --git a/WaveToyX/test/reflecting/norms/driver-regrid_error.tsv b/WaveToyX/test/reflecting/norms/regrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/reflecting/norms/driver-regrid_error.tsv
rename to WaveToyX/test/reflecting/norms/regrid-regrid_error.tsv
diff --git a/WaveToyX/test/standing/norms/driver-regrid_error.tsv b/WaveToyX/test/standing/norms/regrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/standing/norms/driver-regrid_error.tsv
rename to WaveToyX/test/standing/norms/regrid-regrid_error.tsv
diff --git a/WaveToyX/test/standing2/norms/driver-regrid_error.tsv b/WaveToyX/test/standing2/norms/regrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/standing2/norms/driver-regrid_error.tsv
rename to WaveToyX/test/standing2/norms/regrid-regrid_error.tsv

From ede9a791e49f86c6c30dc5af58d3016572997129 Mon Sep 17 00:00:00 2001
From: "Steven R. Brandt" <sbrandt@cct.lsu.edu>
Date: Fri, 2 Aug 2024 10:55:22 -0500
Subject: [PATCH 3/3] CarpetX: Rename the thorn providing regrid_error from
 Regrid to CarpetXRegrid

---
 BoxInBox/interface.ccl                            |  2 +-
 BoxInBox/schedule.ccl                             |  4 ++--
 BoxInBox/test/levels1.par                         |  6 +++++-
 ... => carpetxregrid-regrid_error.it000000.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.z.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 BoxInBox/test/levels2.par                         |  5 ++++-
 ... => carpetxregrid-regrid_error.it000000.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.z.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 BoxInBox/test/levels20.par                        |  5 ++++-
 ... => carpetxregrid-regrid_error.it000000.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.z.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 BoxInBox/test/levels3.par                         |  5 ++++-
 ... => carpetxregrid-regrid_error.it000000.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.z.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 BoxInBox/test/regions2.par                        |  5 ++++-
 ... => carpetxregrid-regrid_error.it000000.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.z.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 BoxInBox/test/regions3.par                        |  5 ++++-
 ... => carpetxregrid-regrid_error.it000000.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.z.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 BoxInBox/test/unigrid.par                         |  5 ++++-
 ... => carpetxregrid-regrid_error.it000000.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000010.z.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 CarpetX/interface.ccl                             |  2 --
 CarpetX/param.ccl                                 | 15 +++++++--------
 CarpetX/schedule.ccl                              |  2 +-
 CarpetX/src/driver.cxx                            |  2 +-
 CarpetX/src/schedule.cxx                          |  4 ++--
 {Regrid => CarpetXRegrid}/README                  |  0
 {Regrid => CarpetXRegrid}/configuration.ccl       |  0
 {Regrid => CarpetXRegrid}/doc/documentation.tex   |  0
 {Regrid => CarpetXRegrid}/interface.ccl           |  2 +-
 {Regrid => CarpetXRegrid}/param.ccl               |  0
 {Regrid => CarpetXRegrid}/schedule.ccl            |  2 +-
 {Regrid => CarpetXRegrid}/src/make.code.defn      |  0
 {Regrid => CarpetXRegrid}/src/regrid_error.cxx    |  3 ---
 ErrorEstimator/interface.ccl                      |  2 +-
 ErrorEstimator/schedule.ccl                       |  4 ++--
 FluxWaveToyX/test/radiative.par                   |  3 +++
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 FluxWaveToyX/test/reflecting.par                  |  3 +++
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 MovingBoxToy/par/circle.par                       |  2 +-
 MovingBoxToy/test/circle.par                      |  2 +-
 ... => carpetxregrid-regrid_error.it000000.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000000.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000001.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000001.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000001.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000002.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000002.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000002.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000003.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000003.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000003.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000004.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000004.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000004.z.tsv} |  0
 ... => carpetxregrid-regrid_error.it000005.x.tsv} |  0
 ... => carpetxregrid-regrid_error.it000005.y.tsv} |  0
 ... => carpetxregrid-regrid_error.it000005.z.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestBoxInBox/test/moving.par                      |  2 +-
 TestDerivs/interface.ccl                          |  2 +-
 TestDerivs/schedule.ccl                           |  2 +-
 TestNorms/interface.ccl                           |  2 +-
 TestNorms/schedule.ccl                            |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestODESolvers/test/test-constant.par             |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestODESolvers/test/test-dp87.par                 |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestODESolvers/test/test-euler.par                |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestODESolvers/test/test-rk2.par                  |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestODESolvers/test/test-rk3.par                  |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestODESolvers/test/test-rk4.par                  |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestODESolvers/test/test-rkf78.par                |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestODESolvers/test/test-ssprk3.par               |  2 +-
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 TestOutput/test/checkpoint-openpmd.par            |  3 +++
 TestOutput/test/output-arrays.par                 |  3 +++
 TestOutput/test/output-openpmd.par                |  3 +++
 TestProlongate/interface.ccl                      |  2 +-
 TestProlongate/schedule.ccl                       |  4 ++--
 TestProlongate/test/test_cc_co_o1.par             |  3 +++
 TestProlongate/test/test_cc_nc_o1.par             |  3 +++
 TestProlongate/test/test_cc_nc_o3.par             |  3 +++
 TestProlongate/test/test_ddf_eno_o1.par           |  3 +++
 TestProlongate/test/test_ddf_eno_o3.par           |  3 +++
 TestProlongate/test/test_ddf_o1.par               |  3 +++
 TestProlongate/test/test_ddf_o3.par               |  3 +++
 TestProlongate/test/test_ddf_o5.par               |  3 +++
 TestProlongate/test/test_ddf_o7.par               |  3 +++
 TestProlongate/test/test_ddfh_o1.par              |  3 +++
 TestProlongate/test/test_ddfh_o3.par              |  3 +++
 TestProlongate/test/test_ddfh_o5.par              |  3 +++
 TestProlongate/test/test_natural_o1.par           |  3 +++
 TestProlongate/test/test_natural_o3.par           |  3 +++
 TestProlongate/test/test_natural_o5.par           |  3 +++
 TestProlongate/test/test_natural_o7.par           |  3 +++
 TestProlongate/test/test_poly_cons3lfb_o1.par     |  3 +++
 TestProlongate/test/test_poly_cons3lfb_o3.par     |  3 +++
 TestProlongate/test/test_poly_cons3lfb_o5.par     |  3 +++
 WaveToyX/schedule.ccl                             |  4 ++--
 WaveToyX/test/radiative.par                       |  3 +++
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 WaveToyX/test/reflecting.par                      |  3 +++
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 ...d_error.tsv => carpetxregrid-regrid_error.tsv} |  0
 155 files changed, 146 insertions(+), 52 deletions(-)
 rename BoxInBox/test/levels1/{regrid-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels1/{regrid-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels1/{regrid-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels1/{regrid-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels1/{regrid-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels1/{regrid-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels1/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels2/{regrid-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels2/{regrid-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels2/{regrid-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels2/{regrid-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels2/{regrid-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels2/{regrid-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels2/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels20/{regrid-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels20/{regrid-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels20/{regrid-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels20/{regrid-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels20/{regrid-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels20/{regrid-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels20/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels3/{regrid-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels3/{regrid-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels3/{regrid-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels3/{regrid-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels3/{regrid-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels3/{regrid-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels3/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/regions2/{regrid-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/regions2/{regrid-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/regions2/{regrid-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/regions2/{regrid-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/regions2/{regrid-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/regions2/{regrid-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/regions2/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/regions3/{regrid-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/regions3/{regrid-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/regions3/{regrid-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/regions3/{regrid-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/regions3/{regrid-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/regions3/{regrid-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/regions3/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/unigrid/{regrid-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/unigrid/{regrid-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/unigrid/{regrid-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/unigrid/{regrid-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/unigrid/{regrid-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/unigrid/{regrid-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/unigrid/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename {Regrid => CarpetXRegrid}/README (100%)
 rename {Regrid => CarpetXRegrid}/configuration.ccl (100%)
 rename {Regrid => CarpetXRegrid}/doc/documentation.tex (100%)
 rename {Regrid => CarpetXRegrid}/interface.ccl (86%)
 rename {Regrid => CarpetXRegrid}/param.ccl (100%)
 rename {Regrid => CarpetXRegrid}/schedule.ccl (72%)
 rename {Regrid => CarpetXRegrid}/src/make.code.defn (100%)
 rename {Regrid => CarpetXRegrid}/src/regrid_error.cxx (91%)
 rename FluxWaveToyX/test/radiative/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename FluxWaveToyX/test/reflecting/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename FluxWaveToyX/test/standing/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000001.x.tsv => carpetxregrid-regrid_error.it000001.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000001.y.tsv => carpetxregrid-regrid_error.it000001.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000001.z.tsv => carpetxregrid-regrid_error.it000001.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000002.x.tsv => carpetxregrid-regrid_error.it000002.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000002.y.tsv => carpetxregrid-regrid_error.it000002.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000002.z.tsv => carpetxregrid-regrid_error.it000002.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000003.x.tsv => carpetxregrid-regrid_error.it000003.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000003.y.tsv => carpetxregrid-regrid_error.it000003.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000003.z.tsv => carpetxregrid-regrid_error.it000003.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000004.x.tsv => carpetxregrid-regrid_error.it000004.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000004.y.tsv => carpetxregrid-regrid_error.it000004.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000004.z.tsv => carpetxregrid-regrid_error.it000004.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000005.x.tsv => carpetxregrid-regrid_error.it000005.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000005.y.tsv => carpetxregrid-regrid_error.it000005.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{regrid-regrid_error.it000005.z.tsv => carpetxregrid-regrid_error.it000005.z.tsv} (100%)
 rename MovingBoxToy/test/circle/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename SIMDWaveToyX/test/standing/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename SpacetimeWaveToyX/test/standing/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename StaggeredWaveToyX/test/standing/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestNorms/test/norms/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-constant/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-dp87/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-euler/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk2/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk3/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk4/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rkf78/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-ssprk3/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/radiative/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/reflecting/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/standing/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/standing2/norms/{regrid-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)

diff --git a/BoxInBox/interface.ccl b/BoxInBox/interface.ccl
index 1c0e5e116..82a59a64b 100644
--- a/BoxInBox/interface.ccl
+++ b/BoxInBox/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: BoxInBox
 
-INHERITS: Driver, Regrid
+INHERITS: Driver, CarpetXRegrid
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/BoxInBox/schedule.ccl b/BoxInBox/schedule.ccl
index b38dc05b3..d13f4f5b3 100644
--- a/BoxInBox/schedule.ccl
+++ b/BoxInBox/schedule.ccl
@@ -19,7 +19,7 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT postinitial
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: Regrid::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
@@ -30,5 +30,5 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: Regrid::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
diff --git a/BoxInBox/test/levels1.par b/BoxInBox/test/levels1.par
index 319cf4d76..fb8e82031 100644
--- a/BoxInBox/test/levels1.par
+++ b/BoxInBox/test/levels1.par
@@ -39,7 +39,11 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/BoxInBox/test/levels1/regrid-regrid_error.it000000.x.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels1/regrid-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels1/regrid-regrid_error.it000000.y.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels1/regrid-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels1/regrid-regrid_error.it000000.z.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels1/regrid-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels1/regrid-regrid_error.it000010.x.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels1/regrid-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels1/regrid-regrid_error.it000010.y.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels1/regrid-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels1/regrid-regrid_error.it000010.z.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels1/regrid-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels1/norms/regrid-regrid_error.tsv b/BoxInBox/test/levels1/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels1/norms/regrid-regrid_error.tsv
rename to BoxInBox/test/levels1/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels2.par b/BoxInBox/test/levels2.par
index 0160f4b34..c945e04e6 100644
--- a/BoxInBox/test/levels2.par
+++ b/BoxInBox/test/levels2.par
@@ -40,7 +40,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/BoxInBox/test/levels2/regrid-regrid_error.it000000.x.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels2/regrid-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels2/regrid-regrid_error.it000000.y.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels2/regrid-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels2/regrid-regrid_error.it000000.z.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels2/regrid-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels2/regrid-regrid_error.it000010.x.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels2/regrid-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels2/regrid-regrid_error.it000010.y.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels2/regrid-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels2/regrid-regrid_error.it000010.z.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels2/regrid-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels2/norms/regrid-regrid_error.tsv b/BoxInBox/test/levels2/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels2/norms/regrid-regrid_error.tsv
rename to BoxInBox/test/levels2/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels20.par b/BoxInBox/test/levels20.par
index cf3eefed2..1fd6060a4 100644
--- a/BoxInBox/test/levels20.par
+++ b/BoxInBox/test/levels20.par
@@ -58,7 +58,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/BoxInBox/test/levels20/regrid-regrid_error.it000000.x.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels20/regrid-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels20/regrid-regrid_error.it000000.y.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels20/regrid-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels20/regrid-regrid_error.it000000.z.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels20/regrid-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels20/regrid-regrid_error.it000010.x.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels20/regrid-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels20/regrid-regrid_error.it000010.y.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels20/regrid-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels20/regrid-regrid_error.it000010.z.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels20/regrid-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels20/norms/regrid-regrid_error.tsv b/BoxInBox/test/levels20/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels20/norms/regrid-regrid_error.tsv
rename to BoxInBox/test/levels20/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels3.par b/BoxInBox/test/levels3.par
index afdc352dd..0551b07b7 100644
--- a/BoxInBox/test/levels3.par
+++ b/BoxInBox/test/levels3.par
@@ -41,7 +41,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/BoxInBox/test/levels3/regrid-regrid_error.it000000.x.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels3/regrid-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels3/regrid-regrid_error.it000000.y.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels3/regrid-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels3/regrid-regrid_error.it000000.z.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels3/regrid-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels3/regrid-regrid_error.it000010.x.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels3/regrid-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels3/regrid-regrid_error.it000010.y.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels3/regrid-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels3/regrid-regrid_error.it000010.z.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels3/regrid-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels3/norms/regrid-regrid_error.tsv b/BoxInBox/test/levels3/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels3/norms/regrid-regrid_error.tsv
rename to BoxInBox/test/levels3/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/regions2.par b/BoxInBox/test/regions2.par
index a38342145..d91b30815 100644
--- a/BoxInBox/test/regions2.par
+++ b/BoxInBox/test/regions2.par
@@ -50,7 +50,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/BoxInBox/test/regions2/regrid-regrid_error.it000000.x.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/regions2/regrid-regrid_error.it000000.x.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/regions2/regrid-regrid_error.it000000.y.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/regions2/regrid-regrid_error.it000000.y.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/regions2/regrid-regrid_error.it000000.z.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/regions2/regrid-regrid_error.it000000.z.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/regions2/regrid-regrid_error.it000010.x.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/regions2/regrid-regrid_error.it000010.x.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/regions2/regrid-regrid_error.it000010.y.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/regions2/regrid-regrid_error.it000010.y.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/regions2/regrid-regrid_error.it000010.z.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/regions2/regrid-regrid_error.it000010.z.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/regions2/norms/regrid-regrid_error.tsv b/BoxInBox/test/regions2/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/regions2/norms/regrid-regrid_error.tsv
rename to BoxInBox/test/regions2/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/regions3.par b/BoxInBox/test/regions3.par
index 7b191dbc5..b2f781ab9 100644
--- a/BoxInBox/test/regions3.par
+++ b/BoxInBox/test/regions3.par
@@ -61,7 +61,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/BoxInBox/test/regions3/regrid-regrid_error.it000000.x.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/regions3/regrid-regrid_error.it000000.x.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/regions3/regrid-regrid_error.it000000.y.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/regions3/regrid-regrid_error.it000000.y.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/regions3/regrid-regrid_error.it000000.z.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/regions3/regrid-regrid_error.it000000.z.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/regions3/regrid-regrid_error.it000010.x.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/regions3/regrid-regrid_error.it000010.x.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/regions3/regrid-regrid_error.it000010.y.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/regions3/regrid-regrid_error.it000010.y.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/regions3/regrid-regrid_error.it000010.z.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/regions3/regrid-regrid_error.it000010.z.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/regions3/norms/regrid-regrid_error.tsv b/BoxInBox/test/regions3/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/regions3/norms/regrid-regrid_error.tsv
rename to BoxInBox/test/regions3/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/unigrid.par b/BoxInBox/test/unigrid.par
index b2fc44e08..37bc0474b 100644
--- a/BoxInBox/test/unigrid.par
+++ b/BoxInBox/test/unigrid.par
@@ -38,7 +38,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/BoxInBox/test/unigrid/regrid-regrid_error.it000000.x.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/regrid-regrid_error.it000000.x.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/unigrid/regrid-regrid_error.it000000.y.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/regrid-regrid_error.it000000.y.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/unigrid/regrid-regrid_error.it000000.z.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/regrid-regrid_error.it000000.z.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/unigrid/regrid-regrid_error.it000010.x.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/regrid-regrid_error.it000010.x.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/unigrid/regrid-regrid_error.it000010.y.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/regrid-regrid_error.it000010.y.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/unigrid/regrid-regrid_error.it000010.z.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/regrid-regrid_error.it000010.z.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/unigrid/norms/regrid-regrid_error.tsv b/BoxInBox/test/unigrid/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/norms/regrid-regrid_error.tsv
rename to BoxInBox/test/unigrid/norms/carpetxregrid-regrid_error.tsv
diff --git a/CarpetX/interface.ccl b/CarpetX/interface.ccl
index e46ccd724..61dc258ed 100644
--- a/CarpetX/interface.ccl
+++ b/CarpetX/interface.ccl
@@ -2,8 +2,6 @@
 
 IMPLEMENTS: Driver
 
-INHERITS: IO
-
 USES INCLUDE HEADER: silo.hxx
 
 USES INCLUDE HEADER: defs.hxx
diff --git a/CarpetX/param.ccl b/CarpetX/param.ccl
index 3627378ff..9471bea9a 100644
--- a/CarpetX/param.ccl
+++ b/CarpetX/param.ccl
@@ -72,22 +72,21 @@ CCTK_INT ncells_z "Number of grid cells"
 RESTRICTED:
 
 # Do not use
-BOOLEAN periodic "Periodic"
+BOOLEAN periodic "Do not use"
 {
- no :: "Only valid value"
 } no
 
-BOOLEAN periodic_x "Periodic"
+BOOLEAN periodic_x "Do not use"
 {
-} no
+} yes
 
-BOOLEAN periodic_y "Periodic"
+BOOLEAN periodic_y "Do not use"
 {
-} no
+} yes
 
-BOOLEAN periodic_z "Periodic"
+BOOLEAN periodic_z "Do not use"
 {
-} no
+} yes
 
 
 
diff --git a/CarpetX/schedule.ccl b/CarpetX/schedule.ccl
index a2b111960..14ec9f2aa 100644
--- a/CarpetX/schedule.ccl
+++ b/CarpetX/schedule.ccl
@@ -25,7 +25,7 @@ if (!CCTK_Equals(recover, "no") && *recover_file)
 #SCHEDULE CarpetX_InitError AT basegrid
 #{
 #  LANG: C
-#  WRITES: Regrid::regrid_error(everywhere)
+#  WRITES: CarpetXRegrid::regrid_error(everywhere)
 #} "Initialize regridding error to zero"
 
 
diff --git a/CarpetX/src/driver.cxx b/CarpetX/src/driver.cxx
index 92890590a..f9c732b59 100644
--- a/CarpetX/src/driver.cxx
+++ b/CarpetX/src/driver.cxx
@@ -1534,7 +1534,7 @@ void CactusAmrCore::ErrorEst(const int level, amrex::TagBoxArray &tags,
 #pragma omp critical
     CCTK_VINFO("ErrorEst patch %d level %d", patch, level);
 
-  const int gi = CCTK_GroupIndex("Regrid::regrid_error");
+  const int gi = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi >= 0);
   const int vi = 0;
   const int tl = 0;
diff --git a/CarpetX/src/schedule.cxx b/CarpetX/src/schedule.cxx
index cd5e33d13..344deda71 100644
--- a/CarpetX/src/schedule.cxx
+++ b/CarpetX/src/schedule.cxx
@@ -2240,7 +2240,7 @@ int SyncGroupsByDirI(const cGH *restrict cctkGH, int numgroups,
     CCTK_VINFO("SyncGroups %s", buf.str().c_str());
   }
 
-  const int gi_regrid_error = CCTK_GroupIndex("Regrid::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi_regrid_error >= 0);
 
   vector<int> groups;
@@ -2621,7 +2621,7 @@ void Restrict(const cGH *cctkGH, int level, const vector<int> &groups) {
   static Timer timer("Restrict");
   Interval interval(timer);
 
-  const int gi_regrid_error = CCTK_GroupIndex("Regrid::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi_regrid_error >= 0);
 
   for (const auto &patchdata : ghext->patchdata) {
diff --git a/Regrid/README b/CarpetXRegrid/README
similarity index 100%
rename from Regrid/README
rename to CarpetXRegrid/README
diff --git a/Regrid/configuration.ccl b/CarpetXRegrid/configuration.ccl
similarity index 100%
rename from Regrid/configuration.ccl
rename to CarpetXRegrid/configuration.ccl
diff --git a/Regrid/doc/documentation.tex b/CarpetXRegrid/doc/documentation.tex
similarity index 100%
rename from Regrid/doc/documentation.tex
rename to CarpetXRegrid/doc/documentation.tex
diff --git a/Regrid/interface.ccl b/CarpetXRegrid/interface.ccl
similarity index 86%
rename from Regrid/interface.ccl
rename to CarpetXRegrid/interface.ccl
index b54f24cba..abf24ec1c 100644
--- a/Regrid/interface.ccl
+++ b/CarpetXRegrid/interface.ccl
@@ -1,5 +1,5 @@
 # Interface definition for thorn Regrid
-implements: Regrid
+implements: CarpetXRegrid
 inherits:
 PUBLIC:
 
diff --git a/Regrid/param.ccl b/CarpetXRegrid/param.ccl
similarity index 100%
rename from Regrid/param.ccl
rename to CarpetXRegrid/param.ccl
diff --git a/Regrid/schedule.ccl b/CarpetXRegrid/schedule.ccl
similarity index 72%
rename from Regrid/schedule.ccl
rename to CarpetXRegrid/schedule.ccl
index 876f43ff1..6ebb702a9 100644
--- a/Regrid/schedule.ccl
+++ b/CarpetXRegrid/schedule.ccl
@@ -2,5 +2,5 @@
 SCHEDULE CarpetX_InitError AT basegrid
 {
   LANG: C
-  WRITES: Regrid::regrid_error(everywhere)
+  WRITES: CarpetXRegrid::regrid_error(everywhere)
 } "Initialize regridding error to zero"
diff --git a/Regrid/src/make.code.defn b/CarpetXRegrid/src/make.code.defn
similarity index 100%
rename from Regrid/src/make.code.defn
rename to CarpetXRegrid/src/make.code.defn
diff --git a/Regrid/src/regrid_error.cxx b/CarpetXRegrid/src/regrid_error.cxx
similarity index 91%
rename from Regrid/src/regrid_error.cxx
rename to CarpetXRegrid/src/regrid_error.cxx
index eee9fc5bf..7ac8cdc99 100644
--- a/Regrid/src/regrid_error.cxx
+++ b/CarpetXRegrid/src/regrid_error.cxx
@@ -1,6 +1,3 @@
-//#include "schedule.hxx"
-
-#include <loop.hxx>
 #include <loop_device.hxx>
 
 #include <cctk.h>
diff --git a/ErrorEstimator/interface.ccl b/ErrorEstimator/interface.ccl
index 619ffa2ca..7fe9a36fd 100644
--- a/ErrorEstimator/interface.ccl
+++ b/ErrorEstimator/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: ErrorEstimator
 
-INHERITS: Driver, Regrid
+INHERITS: Driver, CarpetXRegrid
 
 
 
diff --git a/ErrorEstimator/schedule.ccl b/ErrorEstimator/schedule.ccl
index c2e867234..c61a116fe 100644
--- a/ErrorEstimator/schedule.ccl
+++ b/ErrorEstimator/schedule.ccl
@@ -5,11 +5,11 @@
 SCHEDULE ErrorEstimator_Estimate AS EstimateError AT postinitial
 {
   LANG: C
-  WRITES: Regrid::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE ErrorEstimator_Estimate AS EstimateError AT poststep
 {
   LANG: C
-  WRITES: Regrid::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
diff --git a/FluxWaveToyX/test/radiative.par b/FluxWaveToyX/test/radiative.par
index 1b43bfe92..736a6e18d 100644
--- a/FluxWaveToyX/test/radiative.par
+++ b/FluxWaveToyX/test/radiative.par
@@ -45,3 +45,6 @@ CarpetX::out_tsv_vars = "
     FluxWaveToyX::energy
     FluxWaveToyX::error
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/FluxWaveToyX/test/radiative/norms/regrid-regrid_error.tsv b/FluxWaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/radiative/norms/regrid-regrid_error.tsv
rename to FluxWaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
diff --git a/FluxWaveToyX/test/reflecting.par b/FluxWaveToyX/test/reflecting.par
index bbefdaa5e..76e5d907e 100644
--- a/FluxWaveToyX/test/reflecting.par
+++ b/FluxWaveToyX/test/reflecting.par
@@ -44,3 +44,6 @@ CarpetX::out_tsv_vars = "
     FluxWaveToyX::energy
     FluxWaveToyX::error
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/FluxWaveToyX/test/reflecting/norms/regrid-regrid_error.tsv b/FluxWaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/reflecting/norms/regrid-regrid_error.tsv
rename to FluxWaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
diff --git a/FluxWaveToyX/test/standing/norms/regrid-regrid_error.tsv b/FluxWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/standing/norms/regrid-regrid_error.tsv
rename to FluxWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/MovingBoxToy/par/circle.par b/MovingBoxToy/par/circle.par
index 6370d7b57..3fdff9cab 100644
--- a/MovingBoxToy/par/circle.par
+++ b/MovingBoxToy/par/circle.par
@@ -52,7 +52,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_silo_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/MovingBoxToy/test/circle.par b/MovingBoxToy/test/circle.par
index b67358733..75c556f20 100644
--- a/MovingBoxToy/test/circle.par
+++ b/MovingBoxToy/test/circle.par
@@ -52,7 +52,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000000.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000000.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000000.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000000.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000000.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000000.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000001.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000001.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.x.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000001.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000001.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.y.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000001.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000001.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.z.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000002.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000002.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.x.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000002.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000002.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.y.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000002.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000002.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.z.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000003.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000003.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.x.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000003.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000003.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.y.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000003.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000003.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.z.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000004.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000004.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.x.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000004.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000004.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.y.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000004.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000004.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.z.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000005.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000005.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.x.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000005.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000005.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.y.tsv
diff --git a/MovingBoxToy/test/circle/regrid-regrid_error.it000005.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/regrid-regrid_error.it000005.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.z.tsv
diff --git a/MovingBoxToy/test/circle/norms/regrid-regrid_error.tsv b/MovingBoxToy/test/circle/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/norms/regrid-regrid_error.tsv
rename to MovingBoxToy/test/circle/norms/carpetxregrid-regrid_error.tsv
diff --git a/SIMDWaveToyX/test/standing/norms/regrid-regrid_error.tsv b/SIMDWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from SIMDWaveToyX/test/standing/norms/regrid-regrid_error.tsv
rename to SIMDWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/SpacetimeWaveToyX/test/standing/norms/regrid-regrid_error.tsv b/SpacetimeWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from SpacetimeWaveToyX/test/standing/norms/regrid-regrid_error.tsv
rename to SpacetimeWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/StaggeredWaveToyX/test/standing/norms/regrid-regrid_error.tsv b/StaggeredWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from StaggeredWaveToyX/test/standing/norms/regrid-regrid_error.tsv
rename to StaggeredWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestBoxInBox/test/moving.par b/TestBoxInBox/test/moving.par
index 7115aac76..41c81270b 100644
--- a/TestBoxInBox/test/moving.par
+++ b/TestBoxInBox/test/moving.par
@@ -40,7 +40,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/TestDerivs/interface.ccl b/TestDerivs/interface.ccl
index 350916f75..81a7af703 100644
--- a/TestDerivs/interface.ccl
+++ b/TestDerivs/interface.ccl
@@ -1,7 +1,7 @@
 # Interface definition for thorn TestDerivs
 IMPLEMENTS: TestDerivs
 
-INHERITS: Driver, Regrid
+INHERITS: Driver, CarpetXRegrid
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/TestDerivs/schedule.ccl b/TestDerivs/schedule.ccl
index 221a990cb..1d583f928 100644
--- a/TestDerivs/schedule.ccl
+++ b/TestDerivs/schedule.ccl
@@ -7,7 +7,7 @@ STORAGE: ddchi
 SCHEDULE TestDerivs_SetError AT postinitial
 {
   LANG: C
-  WRITES: Regrid::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestDerivs_Set AT initial
diff --git a/TestNorms/interface.ccl b/TestNorms/interface.ccl
index fa7cfce93..29d87ff0a 100644
--- a/TestNorms/interface.ccl
+++ b/TestNorms/interface.ccl
@@ -1,6 +1,6 @@
 # Interface definition for thorn TestNorms
 implements: TestNorms
-inherits: Driver, Regrid
+inherits: Driver, CarpetXRegrid
 
 uses include header: loop.hxx
 
diff --git a/TestNorms/schedule.ccl b/TestNorms/schedule.ccl
index 99238a884..95f895383 100644
--- a/TestNorms/schedule.ccl
+++ b/TestNorms/schedule.ccl
@@ -12,7 +12,7 @@ STORAGE: gf111
 SCHEDULE TestNorms_SetError AT postinitial
 {
   LANG: C
-  WRITES: Regrid::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestNorms_Set AT initial
diff --git a/TestNorms/test/norms/norms/regrid-regrid_error.tsv b/TestNorms/test/norms/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestNorms/test/norms/norms/regrid-regrid_error.tsv
rename to TestNorms/test/norms/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-constant.par b/TestODESolvers/test/test-constant.par
index db2442553..e90a6ab39 100644
--- a/TestODESolvers/test/test-constant.par
+++ b/TestODESolvers/test/test-constant.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-constant/norms/regrid-regrid_error.tsv b/TestODESolvers/test/test-constant/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-constant/norms/regrid-regrid_error.tsv
rename to TestODESolvers/test/test-constant/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-dp87.par b/TestODESolvers/test/test-dp87.par
index a000668ef..2459c61fb 100644
--- a/TestODESolvers/test/test-dp87.par
+++ b/TestODESolvers/test/test-dp87.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-dp87/norms/regrid-regrid_error.tsv b/TestODESolvers/test/test-dp87/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-dp87/norms/regrid-regrid_error.tsv
rename to TestODESolvers/test/test-dp87/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-euler.par b/TestODESolvers/test/test-euler.par
index 04aa07067..5a135b0d0 100644
--- a/TestODESolvers/test/test-euler.par
+++ b/TestODESolvers/test/test-euler.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-euler/norms/regrid-regrid_error.tsv b/TestODESolvers/test/test-euler/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-euler/norms/regrid-regrid_error.tsv
rename to TestODESolvers/test/test-euler/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk2.par b/TestODESolvers/test/test-rk2.par
index afa7f67fc..387cad727 100644
--- a/TestODESolvers/test/test-rk2.par
+++ b/TestODESolvers/test/test-rk2.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk2/norms/regrid-regrid_error.tsv b/TestODESolvers/test/test-rk2/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk2/norms/regrid-regrid_error.tsv
rename to TestODESolvers/test/test-rk2/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk3.par b/TestODESolvers/test/test-rk3.par
index 58438cab3..ab9c46dcf 100644
--- a/TestODESolvers/test/test-rk3.par
+++ b/TestODESolvers/test/test-rk3.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk3/norms/regrid-regrid_error.tsv b/TestODESolvers/test/test-rk3/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk3/norms/regrid-regrid_error.tsv
rename to TestODESolvers/test/test-rk3/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk4.par b/TestODESolvers/test/test-rk4.par
index 996577dfa..76fac4985 100644
--- a/TestODESolvers/test/test-rk4.par
+++ b/TestODESolvers/test/test-rk4.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk4/norms/regrid-regrid_error.tsv b/TestODESolvers/test/test-rk4/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk4/norms/regrid-regrid_error.tsv
rename to TestODESolvers/test/test-rk4/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rkf78.par b/TestODESolvers/test/test-rkf78.par
index 3ddd435a0..6f199a4ad 100644
--- a/TestODESolvers/test/test-rkf78.par
+++ b/TestODESolvers/test/test-rkf78.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rkf78/norms/regrid-regrid_error.tsv b/TestODESolvers/test/test-rkf78/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rkf78/norms/regrid-regrid_error.tsv
rename to TestODESolvers/test/test-rkf78/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-ssprk3.par b/TestODESolvers/test/test-ssprk3.par
index a74825ad3..5b92b799e 100644
--- a/TestODESolvers/test/test-ssprk3.par
+++ b/TestODESolvers/test/test-ssprk3.par
@@ -34,7 +34,7 @@ CarpetX::out_metadata = no
 CarpetX::out_norm_omit_unstable = yes
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    Regrid::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-ssprk3/norms/regrid-regrid_error.tsv b/TestODESolvers/test/test-ssprk3/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-ssprk3/norms/regrid-regrid_error.tsv
rename to TestODESolvers/test/test-ssprk3/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestOutput/test/checkpoint-openpmd.par b/TestOutput/test/checkpoint-openpmd.par
index 13299182f..fa8cfc943 100644
--- a/TestOutput/test/checkpoint-openpmd.par
+++ b/TestOutput/test/checkpoint-openpmd.par
@@ -44,3 +44,6 @@ IO::checkpoint_dir = $parfile + "/checkpoints"
 IO::checkpoint_ID = yes
 IO::checkpoint_every = 1
 IO::checkpoint_on_terminate = yes
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestOutput/test/output-arrays.par b/TestOutput/test/output-arrays.par
index 774e4dd61..6b00c4694 100644
--- a/TestOutput/test/output-arrays.par
+++ b/TestOutput/test/output-arrays.par
@@ -38,3 +38,6 @@ CarpetX::out_tsv_vars = "
     TestOutput::a2
     TestOutput::a3
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestOutput/test/output-openpmd.par b/TestOutput/test/output-openpmd.par
index bbcd56bbe..981cdd9b2 100644
--- a/TestOutput/test/output-openpmd.par
+++ b/TestOutput/test/output-openpmd.par
@@ -46,3 +46,6 @@ CarpetX::out_openpmd_vars = "
     TestOutput::a2
     TestOutput::a3
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/interface.ccl b/TestProlongate/interface.ccl
index 9157ff01d..db4b7e4d1 100644
--- a/TestProlongate/interface.ccl
+++ b/TestProlongate/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: TestProlongate
 
-INHERITS: Driver, Regrid
+INHERITS: Driver, CarpetXRegrid
 
 USES INCLUDE HEADER: loop.hxx
 
diff --git a/TestProlongate/schedule.ccl b/TestProlongate/schedule.ccl
index 986b138cc..f122993da 100644
--- a/TestProlongate/schedule.ccl
+++ b/TestProlongate/schedule.ccl
@@ -50,13 +50,13 @@ STORAGE: gf111_sum_count
 SCHEDULE TestProlongate_Regrid AT postinitial
 {
   LANG: C
-  WRITES: Regrid::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestProlongate_Regrid AT poststep
 {
   LANG: C
-  WRITES: Regrid::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Set up test grid"
 
 
diff --git a/TestProlongate/test/test_cc_co_o1.par b/TestProlongate/test/test_cc_co_o1.par
index c83ad17cb..ed4d1afca 100644
--- a/TestProlongate/test/test_cc_co_o1.par
+++ b/TestProlongate/test/test_cc_co_o1.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_cc_nc_o1.par b/TestProlongate/test/test_cc_nc_o1.par
index 892b2a274..c94deb011 100644
--- a/TestProlongate/test/test_cc_nc_o1.par
+++ b/TestProlongate/test/test_cc_nc_o1.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_cc_nc_o3.par b/TestProlongate/test/test_cc_nc_o3.par
index 29ddc320a..e1cc26492 100644
--- a/TestProlongate/test/test_cc_nc_o3.par
+++ b/TestProlongate/test/test_cc_nc_o3.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddf_eno_o1.par b/TestProlongate/test/test_ddf_eno_o1.par
index 804367e6d..e07fb5d78 100644
--- a/TestProlongate/test/test_ddf_eno_o1.par
+++ b/TestProlongate/test/test_ddf_eno_o1.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddf_eno_o3.par b/TestProlongate/test/test_ddf_eno_o3.par
index 0609b541f..b30f4346e 100644
--- a/TestProlongate/test/test_ddf_eno_o3.par
+++ b/TestProlongate/test/test_ddf_eno_o3.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddf_o1.par b/TestProlongate/test/test_ddf_o1.par
index c254f983b..1937f19f3 100644
--- a/TestProlongate/test/test_ddf_o1.par
+++ b/TestProlongate/test/test_ddf_o1.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddf_o3.par b/TestProlongate/test/test_ddf_o3.par
index de407cef6..ae34244e5 100644
--- a/TestProlongate/test/test_ddf_o3.par
+++ b/TestProlongate/test/test_ddf_o3.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddf_o5.par b/TestProlongate/test/test_ddf_o5.par
index 8119d2e75..2ae1357ad 100644
--- a/TestProlongate/test/test_ddf_o5.par
+++ b/TestProlongate/test/test_ddf_o5.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddf_o7.par b/TestProlongate/test/test_ddf_o7.par
index 34448ed55..1c8962714 100644
--- a/TestProlongate/test/test_ddf_o7.par
+++ b/TestProlongate/test/test_ddf_o7.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddfh_o1.par b/TestProlongate/test/test_ddfh_o1.par
index 9fa9ac405..dc6320147 100644
--- a/TestProlongate/test/test_ddfh_o1.par
+++ b/TestProlongate/test/test_ddfh_o1.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddfh_o3.par b/TestProlongate/test/test_ddfh_o3.par
index dfe246880..2e24a0f5c 100644
--- a/TestProlongate/test/test_ddfh_o3.par
+++ b/TestProlongate/test/test_ddfh_o3.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_ddfh_o5.par b/TestProlongate/test/test_ddfh_o5.par
index 8c0f5855b..076787681 100644
--- a/TestProlongate/test/test_ddfh_o5.par
+++ b/TestProlongate/test/test_ddfh_o5.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_natural_o1.par b/TestProlongate/test/test_natural_o1.par
index f74b3e4bf..0a4bd7b73 100644
--- a/TestProlongate/test/test_natural_o1.par
+++ b/TestProlongate/test/test_natural_o1.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_natural_o3.par b/TestProlongate/test/test_natural_o3.par
index 946a7ead1..1b580ea78 100644
--- a/TestProlongate/test/test_natural_o3.par
+++ b/TestProlongate/test/test_natural_o3.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_natural_o5.par b/TestProlongate/test/test_natural_o5.par
index 2d99fd3c0..7b0698fea 100644
--- a/TestProlongate/test/test_natural_o5.par
+++ b/TestProlongate/test/test_natural_o5.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_natural_o7.par b/TestProlongate/test/test_natural_o7.par
index d71be4b31..3073aa26f 100644
--- a/TestProlongate/test/test_natural_o7.par
+++ b/TestProlongate/test/test_natural_o7.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_poly_cons3lfb_o1.par b/TestProlongate/test/test_poly_cons3lfb_o1.par
index 9caa4e5bb..27ca5e3c4 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o1.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o1.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_poly_cons3lfb_o3.par b/TestProlongate/test/test_poly_cons3lfb_o3.par
index d3293b058..1eb950ae4 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o3.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o3.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/TestProlongate/test/test_poly_cons3lfb_o5.par b/TestProlongate/test/test_poly_cons3lfb_o5.par
index a4540f577..7e5ed44e5 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o5.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o5.par
@@ -90,3 +90,6 @@ CarpetX::out_tsv_vars = "
     TestProlongate::gf110_sum_count
     TestProlongate::gf111_sum_count
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/WaveToyX/schedule.ccl b/WaveToyX/schedule.ccl
index d29cd6f45..e0630a106 100644
--- a/WaveToyX/schedule.ccl
+++ b/WaveToyX/schedule.ccl
@@ -13,14 +13,14 @@ SCHEDULE WaveToyX_Initial AT initial
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: Regrid::regrid_error(interior)
+#   WRITES: CarpetXRegrid::regrid_error(interior)
 # } "Estimate error for regridding"
 # 
 # SCHEDULE WaveToyX_EstimateError AT poststep
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: Regrid::regrid_error(interior)
+#   WRITES: CarpetXRegrid::regrid_error(interior)
 # } "Estimate error for regridding"
 
 SCHEDULE WaveToyX_RHS IN ODESolvers_RHS
diff --git a/WaveToyX/test/radiative.par b/WaveToyX/test/radiative.par
index 17f58953e..382d249e1 100644
--- a/WaveToyX/test/radiative.par
+++ b/WaveToyX/test/radiative.par
@@ -44,3 +44,6 @@ CarpetX::out_tsv_vars = "
     WaveToyX::energy
     WaveToyX::error
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/WaveToyX/test/radiative/norms/regrid-regrid_error.tsv b/WaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/radiative/norms/regrid-regrid_error.tsv
rename to WaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/reflecting.par b/WaveToyX/test/reflecting.par
index 201496dc9..d7e368482 100644
--- a/WaveToyX/test/reflecting.par
+++ b/WaveToyX/test/reflecting.par
@@ -43,3 +43,6 @@ CarpetX::out_tsv_vars = "
     WaveToyX::energy
     WaveToyX::error
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/WaveToyX/test/reflecting/norms/regrid-regrid_error.tsv b/WaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/reflecting/norms/regrid-regrid_error.tsv
rename to WaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/standing/norms/regrid-regrid_error.tsv b/WaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/standing/norms/regrid-regrid_error.tsv
rename to WaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/standing2/norms/regrid-regrid_error.tsv b/WaveToyX/test/standing2/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/standing2/norms/regrid-regrid_error.tsv
rename to WaveToyX/test/standing2/norms/carpetxregrid-regrid_error.tsv