diff --git a/WaveToyX/interface.ccl b/WaveToyX/interface.ccl
index ddfbbdb47..fd399a45c 100644
--- a/WaveToyX/interface.ccl
+++ b/WaveToyX/interface.ccl
@@ -2,8 +2,6 @@
 
 IMPLEMENTS: WaveToyX
 
-INHERITS: CarpetX
-
 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..3a3b5dc7d 100644
--- a/WaveToyX/par/standing.par
+++ b/WaveToyX/par/standing.par
@@ -13,9 +13,10 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "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 d91981e83..ff0123c46 100644
--- a/WaveToyX/schedule.ccl
+++ b/WaveToyX/schedule.ccl
@@ -12,14 +12,14 @@ SCHEDULE WaveToyX_Initial AT initial
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: CarpetX::regrid_error(interior)
+#   WRITES: CarpetXRegrid::regrid_error(interior)
 # } "Estimate error for regridding"
 # 
 # SCHEDULE WaveToyX_EstimateError AT poststep
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: CarpetX::regrid_error(interior)
+#   WRITES: CarpetXRegrid::regrid_error(interior)
 # } "Estimate error for regridding"
 
 SCHEDULE WaveToyX_RHS IN ODESolvers_RHS
diff --git a/WaveToyX/test/presync.par b/WaveToyX/test/presync.par
index 49d9acb59..ec5172d9a 100644
--- a/WaveToyX/test/presync.par
+++ b/WaveToyX/test/presync.par
@@ -14,9 +14,10 @@ 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 = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
@@ -26,6 +27,7 @@ ODESolvers::method = "RK3"
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -35,7 +37,6 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     WaveToyX::state
-    WaveToyX::rhs
     WaveToyX::energy
     WaveToyX::error
 "
diff --git a/WaveToyX/test/presync/norms/carpetx-regrid_error.tsv b/WaveToyX/test/presync/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/presync/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/presync/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/radiative/norms/carpetx-regrid_error.tsv b/WaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/radiative/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv b/WaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/standing.par b/WaveToyX/test/standing.par
index 2193a1bc1..631510c0e 100644
--- a/WaveToyX/test/standing.par
+++ b/WaveToyX/test/standing.par
@@ -14,9 +14,10 @@ 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 = "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/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv