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