diff --git a/TestOutput/test/output-every0.par b/TestOutput/test/output-every0.par
index 33415d1b4..fd550de0a 100644
--- a/TestOutput/test/output-every0.par
+++ b/TestOutput/test/output-every0.par
@@ -1,6 +1,6 @@
 ActiveThorns = "
     CarpetX
-    Coordinates
+    CoordinatesX
     IOUtil
 "
 
@@ -16,4 +16,4 @@ IO::parfile_write = "no"
 IO::out_every = 0
 
 CarpetX::out_metadata = no
-CarpetX::out_tsv_vars = "Coordinates::cell_volume"
+CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-every1.par b/TestOutput/test/output-every1.par
index 026b5882b..c8aad7f56 100644
--- a/TestOutput/test/output-every1.par
+++ b/TestOutput/test/output-every1.par
@@ -1,6 +1,6 @@
 ActiveThorns = "
     CarpetX
-    Coordinates
+    CoordinatesX
     IOUtil
 "
 
@@ -16,4 +16,4 @@ IO::parfile_write = "no"
 IO::out_every = 1
 
 CarpetX::out_metadata = no
-CarpetX::out_tsv_vars = "Coordinates::cell_volume"
+CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000000.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000000.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000000.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000000.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000000.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000000.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000000.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000000.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000000.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000000.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000000.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000000.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000001.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000001.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000001.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000001.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000001.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000001.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000001.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000001.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000001.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000001.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000001.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000001.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000002.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000002.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000002.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000002.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000002.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000002.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000002.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000002.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000002.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000002.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000002.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000002.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000003.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000003.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000003.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000003.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000003.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000003.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000003.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000003.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000003.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000003.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000003.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000003.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000004.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000004.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000004.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000004.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000004.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000004.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000004.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000004.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000004.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000004.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000004.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000004.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000005.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000005.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000005.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000005.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000005.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000005.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000005.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000005.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000005.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000005.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000005.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000005.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000006.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000006.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000006.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000006.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000006.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000006.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000006.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000006.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000006.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000006.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000006.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000006.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000007.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000007.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000007.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000007.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000007.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000007.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000007.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000007.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000007.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000007.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000007.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000007.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000008.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000008.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000008.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000008.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000008.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000008.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000008.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000008.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000008.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000008.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000008.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000008.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000009.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000009.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000009.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000009.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000009.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000009.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000009.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000009.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000009.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000009.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000009.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000009.z.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000010.x.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000010.x.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000010.x.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000010.x.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000010.y.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000010.y.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000010.y.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000010.y.tsv
diff --git a/TestOutput/test/output-every1/coordinates-cell_volume.it000010.z.tsv b/TestOutput/test/output-every1/coordinatesx-cell_volume.it000010.z.tsv
similarity index 100%
rename from TestOutput/test/output-every1/coordinates-cell_volume.it000010.z.tsv
rename to TestOutput/test/output-every1/coordinatesx-cell_volume.it000010.z.tsv
diff --git a/TestOutput/test/output-every3.par b/TestOutput/test/output-every3.par
index aa44c4693..1233c8162 100644
--- a/TestOutput/test/output-every3.par
+++ b/TestOutput/test/output-every3.par
@@ -1,6 +1,6 @@
 ActiveThorns = "
     CarpetX
-    Coordinates
+    CoordinatesX
     IOUtil
 "
 
@@ -16,4 +16,4 @@ IO::parfile_write = "no"
 IO::out_every = 3
 
 CarpetX::out_metadata = no
-CarpetX::out_tsv_vars = "Coordinates::cell_volume"
+CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000000.x.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000000.x.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000000.x.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000000.x.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000000.y.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000000.y.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000000.y.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000000.y.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000000.z.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000000.z.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000000.z.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000000.z.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000003.x.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000003.x.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000003.x.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000003.x.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000003.y.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000003.y.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000003.y.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000003.y.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000003.z.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000003.z.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000003.z.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000003.z.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000006.x.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000006.x.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000006.x.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000006.x.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000006.y.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000006.y.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000006.y.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000006.y.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000006.z.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000006.z.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000006.z.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000006.z.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000009.x.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000009.x.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000009.x.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000009.x.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000009.y.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000009.y.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000009.y.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000009.y.tsv
diff --git a/TestOutput/test/output-every3/coordinates-cell_volume.it000009.z.tsv b/TestOutput/test/output-every3/coordinatesx-cell_volume.it000009.z.tsv
similarity index 100%
rename from TestOutput/test/output-every3/coordinates-cell_volume.it000009.z.tsv
rename to TestOutput/test/output-every3/coordinatesx-cell_volume.it000009.z.tsv
diff --git a/TestOutput/test/output-tsv-every0.par b/TestOutput/test/output-tsv-every0.par
index 4e212b813..bed1d05ed 100644
--- a/TestOutput/test/output-tsv-every0.par
+++ b/TestOutput/test/output-tsv-every0.par
@@ -1,6 +1,6 @@
 ActiveThorns = "
     CarpetX
-    Coordinates
+    CoordinatesX
     IOUtil
 "
 
@@ -16,4 +16,4 @@ IO::parfile_write = "no"
 CarpetX::out_tsv_every = 0
 
 CarpetX::out_metadata = no
-CarpetX::out_tsv_vars = "Coordinates::cell_volume"
+CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-tsv-every1.par b/TestOutput/test/output-tsv-every1.par
index 6c652347f..623916a87 100644
--- a/TestOutput/test/output-tsv-every1.par
+++ b/TestOutput/test/output-tsv-every1.par
@@ -1,6 +1,6 @@
 ActiveThorns = "
     CarpetX
-    Coordinates
+    CoordinatesX
     IOUtil
 "
 
@@ -16,4 +16,4 @@ IO::parfile_write = "no"
 CarpetX::out_tsv_every = 1
 
 CarpetX::out_metadata = no
-CarpetX::out_tsv_vars = "Coordinates::cell_volume"
+CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000000.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000000.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000000.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000000.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000000.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000000.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000000.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000000.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000000.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000000.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000000.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000000.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000001.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000001.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000001.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000001.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000001.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000001.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000001.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000001.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000001.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000001.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000001.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000001.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000002.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000002.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000002.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000002.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000002.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000002.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000002.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000002.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000002.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000002.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000002.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000002.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000003.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000003.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000003.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000003.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000003.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000003.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000003.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000003.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000003.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000003.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000003.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000003.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000004.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000004.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000004.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000004.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000004.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000004.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000004.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000004.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000004.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000004.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000004.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000004.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000005.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000005.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000005.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000005.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000005.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000005.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000005.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000005.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000005.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000005.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000005.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000005.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000006.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000006.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000006.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000006.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000006.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000006.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000006.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000006.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000006.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000006.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000006.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000006.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000007.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000007.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000007.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000007.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000007.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000007.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000007.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000007.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000007.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000007.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000007.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000007.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000008.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000008.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000008.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000008.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000008.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000008.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000008.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000008.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000008.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000008.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000008.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000008.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000009.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000009.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000009.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000009.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000009.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000009.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000009.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000009.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000009.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000009.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000009.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000009.z.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000010.x.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000010.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000010.x.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000010.x.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000010.y.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000010.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000010.y.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000010.y.tsv
diff --git a/TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000010.z.tsv b/TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000010.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every1/coordinates-cell_volume.it000010.z.tsv
rename to TestOutput/test/output-tsv-every1/coordinatesx-cell_volume.it000010.z.tsv
diff --git a/TestOutput/test/output-tsv-every3.par b/TestOutput/test/output-tsv-every3.par
index 8c9ca60bb..330317b6a 100644
--- a/TestOutput/test/output-tsv-every3.par
+++ b/TestOutput/test/output-tsv-every3.par
@@ -1,6 +1,6 @@
 ActiveThorns = "
     CarpetX
-    Coordinates
+    CoordinatesX
     IOUtil
 "
 
@@ -16,4 +16,4 @@ IO::parfile_write = "no"
 CarpetX::out_tsv_every = 3
 
 CarpetX::out_metadata = no
-CarpetX::out_tsv_vars = "Coordinates::cell_volume"
+CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000000.x.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000000.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000000.x.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000000.x.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000000.y.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000000.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000000.y.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000000.y.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000000.z.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000000.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000000.z.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000000.z.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000003.x.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000003.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000003.x.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000003.x.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000003.y.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000003.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000003.y.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000003.y.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000003.z.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000003.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000003.z.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000003.z.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000006.x.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000006.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000006.x.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000006.x.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000006.y.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000006.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000006.y.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000006.y.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000006.z.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000006.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000006.z.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000006.z.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000009.x.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000009.x.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000009.x.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000009.x.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000009.y.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000009.y.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000009.y.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000009.y.tsv
diff --git a/TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000009.z.tsv b/TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000009.z.tsv
similarity index 100%
rename from TestOutput/test/output-tsv-every3/coordinates-cell_volume.it000009.z.tsv
rename to TestOutput/test/output-tsv-every3/coordinatesx-cell_volume.it000009.z.tsv