diff --git a/tests/MeshDataBaseForTests.cpp b/tests/MeshDataBaseForTests.cpp
index 95399d4564f38313f443f144cf214298577f315a..dff010102d6470df3e75c6d0d303963bb602bf2d 100644
--- a/tests/MeshDataBaseForTests.cpp
+++ b/tests/MeshDataBaseForTests.cpp
@@ -39,19 +39,19 @@ MeshDataBaseForTests::destroy()
 }
 
 std::shared_ptr<const Mesh<Connectivity<1>>>
-MeshDataBaseForTests::cartesianMesh1D() const
+MeshDataBaseForTests::cartesian1DMesh() const
 {
   return m_cartesian_1d_mesh;
 }
 
 std::shared_ptr<const Mesh<Connectivity<2>>>
-MeshDataBaseForTests::cartesianMesh2D() const
+MeshDataBaseForTests::cartesian2DMesh() const
 {
   return m_cartesian_2d_mesh;
 }
 
 std::shared_ptr<const Mesh<Connectivity<3>>>
-MeshDataBaseForTests::cartesianMesh3D() const
+MeshDataBaseForTests::cartesian3DMesh() const
 {
   return m_cartesian_3d_mesh;
 }
diff --git a/tests/MeshDataBaseForTests.hpp b/tests/MeshDataBaseForTests.hpp
index 589ec9b82f9be6451afd496aab3399c13bb3d718..09ab816f52aef55c207ae1bea52898c14fdf2e8f 100644
--- a/tests/MeshDataBaseForTests.hpp
+++ b/tests/MeshDataBaseForTests.hpp
@@ -23,9 +23,10 @@ class MeshDataBaseForTests
   std::shared_ptr<const Mesh<Connectivity<3>>> m_cartesian_3d_mesh;
 
  public:
-  std::shared_ptr<const Mesh<Connectivity<1>>> cartesianMesh1D() const;
-  std::shared_ptr<const Mesh<Connectivity<2>>> cartesianMesh2D() const;
-  std::shared_ptr<const Mesh<Connectivity<3>>> cartesianMesh3D() const;
+  std::shared_ptr<const Mesh<Connectivity<1>>> cartesian1DMesh() const;
+  std::shared_ptr<const Mesh<Connectivity<2>>> cartesian2DMesh() const;
+  std::shared_ptr<const Mesh<Connectivity<3>>> cartesian3DMesh() const;
+
 
   static const MeshDataBaseForTests& get();
   static void create();
diff --git a/tests/test_DiscreteFunctionInterpoler.cpp b/tests/test_DiscreteFunctionInterpoler.cpp
index d24bae5f065ba88afd225268c425b92f9211bcf5..df0589d195aa0be51cadae6ce948d8206a46d177 100644
--- a/tests/test_DiscreteFunctionInterpoler.cpp
+++ b/tests/test_DiscreteFunctionInterpoler.cpp
@@ -43,7 +43,7 @@ TEST_CASE("DiscreteFunctionInterpoler", "[scheme]")
   {
     constexpr size_t Dimension = 1;
 
-    const auto& mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+    const auto& mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
     auto xj             = MeshDataManager::instance().getMeshData(*mesh_1d).xj();
 
     std::string_view data = R"(
@@ -334,7 +334,7 @@ let R3x3_non_linear_1d: R^1 -> R^3x3, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
   {
     constexpr size_t Dimension = 2;
 
-    const auto& mesh_2d = MeshDataBaseForTests::get().cartesianMesh2D();
+    const auto& mesh_2d = MeshDataBaseForTests::get().cartesian2DMesh();
     auto xj             = MeshDataManager::instance().getMeshData(*mesh_2d).xj();
 
     std::string_view data = R"(
@@ -626,7 +626,7 @@ let R3x3_non_linear_2d: R^2 -> R^3x3, x -> (2 * exp(x[0]) * sin(x[1]) + 3, sin(x
   {
     constexpr size_t Dimension = 3;
 
-    const auto& mesh_3d = MeshDataBaseForTests::get().cartesianMesh3D();
+    const auto& mesh_3d = MeshDataBaseForTests::get().cartesian3DMesh();
     auto xj             = MeshDataManager::instance().getMeshData(*mesh_3d).xj();
 
     std::string_view data = R"(
diff --git a/tests/test_DiscreteFunctionP0.cpp b/tests/test_DiscreteFunctionP0.cpp
index f8d7bb6ef78d027287cf7d721299f051ba7c7a98..ce9644d8b485689f5e3790097f1e28f2c80dc764 100644
--- a/tests/test_DiscreteFunctionP0.cpp
+++ b/tests/test_DiscreteFunctionP0.cpp
@@ -22,7 +22,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
   {
     SECTION("1D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       constexpr size_t Dimension = 1;
 
@@ -64,7 +64,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("2D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       constexpr size_t Dimension = 2;
 
@@ -106,7 +106,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("3D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       constexpr size_t Dimension = 3;
 
@@ -161,7 +161,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("1D")
     {
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian1DMesh();
       constexpr size_t Dimension = 1;
 
       DiscreteFunctionP0<Dimension, double> f{mesh};
@@ -182,7 +182,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("2D")
     {
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian2DMesh();
       constexpr size_t Dimension = 2;
 
       DiscreteFunctionP0<Dimension, double> f{mesh};
@@ -203,7 +203,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("3D")
     {
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian3DMesh();
       constexpr size_t Dimension = 3;
 
       DiscreteFunctionP0<Dimension, double> f{mesh};
@@ -237,7 +237,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("1D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       constexpr size_t Dimension = 1;
 
@@ -332,7 +332,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("2D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       constexpr size_t Dimension = 2;
 
@@ -427,7 +427,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("3D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       constexpr size_t Dimension = 3;
 
@@ -525,7 +525,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
   {
     SECTION("1D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       constexpr size_t Dimension = 1;
 
@@ -603,7 +603,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
   {
     SECTION("1D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       constexpr size_t Dimension = 1;
 
@@ -1167,7 +1167,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("2D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       constexpr size_t Dimension = 2;
 
@@ -1736,7 +1736,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("3D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       constexpr size_t Dimension = 3;
 
@@ -2369,7 +2369,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("1D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       constexpr size_t Dimension = 1;
 
@@ -2705,7 +2705,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("2D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       constexpr size_t Dimension = 2;
 
@@ -3041,7 +3041,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
 
     SECTION("3D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       constexpr size_t Dimension = 3;
 
@@ -3385,7 +3385,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
       {
         constexpr size_t Dimension = 1;
 
-        std::shared_ptr mesh_1 = MeshDataBaseForTests::get().cartesianMesh1D();
+        std::shared_ptr mesh_1 = MeshDataBaseForTests::get().cartesian1DMesh();
         std::shared_ptr mesh_2 =
           std::make_shared<Mesh<Connectivity<Dimension>>>(mesh_1->shared_connectivity(), mesh_1->xr());
 
@@ -3404,7 +3404,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
       {
         constexpr size_t Dimension = 2;
 
-        std::shared_ptr mesh_1 = MeshDataBaseForTests::get().cartesianMesh2D();
+        std::shared_ptr mesh_1 = MeshDataBaseForTests::get().cartesian2DMesh();
         std::shared_ptr mesh_2 =
           std::make_shared<Mesh<Connectivity<Dimension>>>(mesh_1->shared_connectivity(), mesh_1->xr());
 
@@ -3423,7 +3423,7 @@ TEST_CASE("DiscreteFunctionP0", "[scheme]")
       {
         constexpr size_t Dimension = 3;
 
-        std::shared_ptr mesh_1 = MeshDataBaseForTests::get().cartesianMesh3D();
+        std::shared_ptr mesh_1 = MeshDataBaseForTests::get().cartesian3DMesh();
         std::shared_ptr mesh_2 =
           std::make_shared<Mesh<Connectivity<Dimension>>>(mesh_1->shared_connectivity(), mesh_1->xr());
 
diff --git a/tests/test_DiscreteFunctionP0Vector.cpp b/tests/test_DiscreteFunctionP0Vector.cpp
index c004ba5732c41dce1af56d3074b9c038b3a1bf8c..72daecc2901162b1712c41f421a49d7bbe9cee7f 100644
--- a/tests/test_DiscreteFunctionP0Vector.cpp
+++ b/tests/test_DiscreteFunctionP0Vector.cpp
@@ -27,7 +27,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 3;
 
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian1DMesh();
       constexpr size_t Dimension = 1;
 
       DiscreteFunctionP0Vector<Dimension, double> f{mesh, size};
@@ -68,7 +68,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 3;
 
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian2DMesh();
       constexpr size_t Dimension = 2;
 
       DiscreteFunctionP0Vector<Dimension, double> f{mesh, size};
@@ -109,7 +109,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 2;
 
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian3DMesh();
       constexpr size_t Dimension = 3;
 
       DiscreteFunctionP0Vector<Dimension, double> f{mesh, size};
@@ -166,7 +166,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 3;
 
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian1DMesh();
       constexpr size_t Dimension = 1;
 
       DiscreteFunctionP0Vector<Dimension, double> f{mesh, size};
@@ -179,7 +179,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 3;
 
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian2DMesh();
       constexpr size_t Dimension = 2;
 
       DiscreteFunctionP0Vector<Dimension, double> f{mesh, size};
@@ -192,7 +192,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 2;
 
-      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh       = MeshDataBaseForTests::get().cartesian3DMesh();
       constexpr size_t Dimension = 3;
 
       DiscreteFunctionP0Vector<Dimension, double> f{mesh, size};
@@ -220,7 +220,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
 
     SECTION("1D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       constexpr size_t Dimension = 1;
 
@@ -260,7 +260,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
 
     SECTION("2D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       constexpr size_t Dimension = 2;
 
@@ -300,7 +300,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
 
     SECTION("3D")
     {
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       constexpr size_t Dimension = 3;
 
@@ -343,7 +343,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     SECTION("1D")
     {
       const size_t size    = 3;
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       constexpr size_t Dimension = 1;
 
@@ -378,7 +378,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     SECTION("2D")
     {
       const size_t size    = 3;
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       constexpr size_t Dimension = 2;
 
@@ -414,7 +414,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     SECTION("3D")
     {
       const size_t size    = 2;
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       constexpr size_t Dimension = 3;
 
@@ -455,7 +455,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 3;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       constexpr size_t Dimension = 1;
 
@@ -582,7 +582,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 3;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       constexpr size_t Dimension = 2;
 
@@ -713,7 +713,7 @@ TEST_CASE("DiscreteFunctionP0Vector", "[scheme]")
     {
       const size_t size = 2;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       constexpr size_t Dimension = 3;
 
diff --git a/tests/test_DiscreteFunctionUtils.cpp b/tests/test_DiscreteFunctionUtils.cpp
index 6587fcba0e201539552e78f4550523b9dbe277eb..511714ed72e367dad950959953199c0f3cba05e3 100644
--- a/tests/test_DiscreteFunctionUtils.cpp
+++ b/tests/test_DiscreteFunctionUtils.cpp
@@ -16,7 +16,7 @@ TEST_CASE("DiscreteFunctionUtils", "[scheme]")
   {
     constexpr size_t Dimension = 1;
 
-    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
     std::shared_ptr mesh_copy =
       std::make_shared<std::decay_t<decltype(*mesh)>>(mesh->shared_connectivity(), mesh->xr());
 
@@ -161,7 +161,7 @@ TEST_CASE("DiscreteFunctionUtils", "[scheme]")
   {
     constexpr size_t Dimension = 2;
 
-    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
     std::shared_ptr mesh_copy =
       std::make_shared<std::decay_t<decltype(*mesh)>>(mesh->shared_connectivity(), mesh->xr());
 
@@ -306,7 +306,7 @@ TEST_CASE("DiscreteFunctionUtils", "[scheme]")
   {
     constexpr size_t Dimension = 3;
 
-    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
     std::shared_ptr mesh_copy =
       std::make_shared<std::decay_t<decltype(*mesh)>>(mesh->shared_connectivity(), mesh->xr());
 
@@ -453,7 +453,7 @@ TEST_CASE("DiscreteFunctionUtils", "[scheme]")
     {
       constexpr size_t Dimension = 1;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
       std::shared_ptr other_mesh =
         CartesianMeshBuilder{TinyVector<1>{-1}, TinyVector<1>{3}, TinyVector<1, size_t>{19}}.mesh();
 
@@ -466,8 +466,8 @@ TEST_CASE("DiscreteFunctionUtils", "[scheme]")
     {
       constexpr size_t Dimension = 1;
 
-      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
-      std::shared_ptr mesh_2d = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
+      std::shared_ptr mesh_2d = MeshDataBaseForTests::get().cartesian2DMesh();
 
       std::shared_ptr uh = std::make_shared<DiscreteFunctionP0<Dimension, double>>(mesh_1d);
 
diff --git a/tests/test_DiscreteFunctionVectorInterpoler.cpp b/tests/test_DiscreteFunctionVectorInterpoler.cpp
index 6a1a5a94b55302aa36fbd85b7d6e7b1522a4ef6b..95d5ce5d8401e2c9b5c04002aac17129aa5668e9 100644
--- a/tests/test_DiscreteFunctionVectorInterpoler.cpp
+++ b/tests/test_DiscreteFunctionVectorInterpoler.cpp
@@ -53,7 +53,7 @@ TEST_CASE("DiscreteFunctionVectorInterpoler", "[scheme]")
   {
     constexpr size_t Dimension = 1;
 
-    const auto& mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+    const auto& mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
     auto xj             = MeshDataManager::instance().getMeshData(*mesh_1d).xj();
 
     std::string_view data = R"(
@@ -149,7 +149,7 @@ let R_scalar_non_linear_1d: R^1 -> R, x -> 2 * exp(x[0]) + 3;
   {
     constexpr size_t Dimension = 2;
 
-    const auto& mesh_2d = MeshDataBaseForTests::get().cartesianMesh2D();
+    const auto& mesh_2d = MeshDataBaseForTests::get().cartesian2DMesh();
     auto xj             = MeshDataManager::instance().getMeshData(*mesh_2d).xj();
 
     std::string_view data = R"(
@@ -245,7 +245,7 @@ let R_scalar_non_linear_2d: R^2 -> R, x -> 2 * exp(x[0] + x[1]) + 3;
   {
     constexpr size_t Dimension = 3;
 
-    const auto& mesh_3d = MeshDataBaseForTests::get().cartesianMesh3D();
+    const auto& mesh_3d = MeshDataBaseForTests::get().cartesian3DMesh();
     auto xj             = MeshDataManager::instance().getMeshData(*mesh_3d).xj();
 
     std::string_view data = R"(
@@ -339,7 +339,7 @@ let R_scalar_non_linear_3d: R^3 -> R, x -> 2 * exp(x[0] + x[1]) + 3 * x[2];
 
   SECTION("errors")
   {
-    const auto& mesh_3d = MeshDataBaseForTests::get().cartesianMesh3D();
+    const auto& mesh_3d = MeshDataBaseForTests::get().cartesian3DMesh();
     auto xj             = MeshDataManager::instance().getMeshData(*mesh_3d).xj();
 
     std::string_view data = R"(
diff --git a/tests/test_EmbeddedIDiscreteFunctionMathFunctions.cpp b/tests/test_EmbeddedIDiscreteFunctionMathFunctions.cpp
index d41be6566f5bcbc1205c5561abf474f02780b6af..f835d1597389b456f90f3e236eec5c25f78e0475 100644
--- a/tests/test_EmbeddedIDiscreteFunctionMathFunctions.cpp
+++ b/tests/test_EmbeddedIDiscreteFunctionMathFunctions.cpp
@@ -109,7 +109,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionMathFunctions", "[scheme]")
 
     using Rd = TinyVector<Dimension>;
 
-    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
     std::shared_ptr other_mesh =
       std::make_shared<Mesh<Connectivity<Dimension>>>(mesh->shared_connectivity(), mesh->xr());
@@ -606,7 +606,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionMathFunctions", "[scheme]")
 
     using Rd = TinyVector<Dimension>;
 
-    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
     std::shared_ptr other_mesh =
       std::make_shared<Mesh<Connectivity<Dimension>>>(mesh->shared_connectivity(), mesh->xr());
@@ -1103,7 +1103,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionMathFunctions", "[scheme]")
 
     using Rd = TinyVector<Dimension>;
 
-    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+    std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
     std::shared_ptr other_mesh =
       std::make_shared<Mesh<Connectivity<Dimension>>>(mesh->shared_connectivity(), mesh->xr());
diff --git a/tests/test_EmbeddedIDiscreteFunctionOperators.cpp b/tests/test_EmbeddedIDiscreteFunctionOperators.cpp
index 5232e8fe8d05aca29d5d56440071c0718a206627..0b0db97f811afb1682679240d7d2240986f2d4d1 100644
--- a/tests/test_EmbeddedIDiscreteFunctionOperators.cpp
+++ b/tests/test_EmbeddedIDiscreteFunctionOperators.cpp
@@ -195,7 +195,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionOperators", "[scheme]")
 
       using Rd = TinyVector<Dimension>;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       std::shared_ptr other_mesh =
         std::make_shared<Mesh<Connectivity<Dimension>>>(mesh->shared_connectivity(), mesh->xr());
@@ -867,7 +867,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionOperators", "[scheme]")
 
       using Rd = TinyVector<Dimension>;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       std::shared_ptr other_mesh =
         std::make_shared<Mesh<Connectivity<Dimension>>>(mesh->shared_connectivity(), mesh->xr());
@@ -1539,7 +1539,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionOperators", "[scheme]")
 
       using Rd = TinyVector<Dimension>;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       std::shared_ptr other_mesh =
         std::make_shared<Mesh<Connectivity<Dimension>>>(mesh->shared_connectivity(), mesh->xr());
@@ -2214,7 +2214,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionOperators", "[scheme]")
 
       using Rd = TinyVector<Dimension>;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian1DMesh();
 
       CellValue<const Rd> xj = MeshDataManager::instance().getMeshData(*mesh).xj();
 
@@ -2351,7 +2351,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionOperators", "[scheme]")
 
       using Rd = TinyVector<Dimension>;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh2D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian2DMesh();
 
       CellValue<const Rd> xj = MeshDataManager::instance().getMeshData(*mesh).xj();
 
@@ -2488,7 +2488,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionOperators", "[scheme]")
 
       using Rd = TinyVector<Dimension>;
 
-      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesianMesh3D();
+      std::shared_ptr mesh = MeshDataBaseForTests::get().cartesian3DMesh();
 
       CellValue<const Rd> xj = MeshDataManager::instance().getMeshData(*mesh).xj();
 
diff --git a/tests/test_EmbeddedIDiscreteFunctionUtils.cpp b/tests/test_EmbeddedIDiscreteFunctionUtils.cpp
index 0ded74fd6b5764bfb67917a48a1a24ab8b1db873..b0227a356f067992a6451266e92833222c50a8fb 100644
--- a/tests/test_EmbeddedIDiscreteFunctionUtils.cpp
+++ b/tests/test_EmbeddedIDiscreteFunctionUtils.cpp
@@ -29,7 +29,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionUtils", "[language]")
 
     SECTION("discrete P0 function")
     {
-      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
 
       REQUIRE(EmbeddedIDiscreteFunctionUtils::getOperandTypeName(DiscreteFunctionP0<1, double>{mesh_1d}) == "Vh(P0:R)");
 
@@ -47,7 +47,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionUtils", "[language]")
 
     SECTION("discrete P0Vector function")
     {
-      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
 
       REQUIRE(EmbeddedIDiscreteFunctionUtils::getOperandTypeName(DiscreteFunctionP0Vector<1, double>{mesh_1d, 2}) ==
               "Vh(P0Vector:R)");
@@ -58,7 +58,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionUtils", "[language]")
   {
     SECTION("from shared_ptr")
     {
-      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
 
       REQUIRE(
         EmbeddedIDiscreteFunctionUtils::isSameDiscretization(std::make_shared<DiscreteFunctionP0<1, double>>(mesh_1d),
@@ -71,7 +71,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionUtils", "[language]")
 
     SECTION("from value")
     {
-      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
 
       REQUIRE(EmbeddedIDiscreteFunctionUtils::isSameDiscretization(DiscreteFunctionP0<1, double>{mesh_1d},
                                                                    DiscreteFunctionP0<1, double>{mesh_1d}));
@@ -106,7 +106,7 @@ TEST_CASE("EmbeddedIDiscreteFunctionUtils", "[language]")
 
     SECTION("invalid data type")
     {
-      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      std::shared_ptr mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
 
       REQUIRE_THROWS_WITH(EmbeddedIDiscreteFunctionUtils::isSameDiscretization(DiscreteFunctionP0<1, int64_t>{mesh_1d},
                                                                                DiscreteFunctionP0<1, int64_t>{mesh_1d}),
diff --git a/tests/test_InterpolateItemArray.cpp b/tests/test_InterpolateItemArray.cpp
index 5e0bbd962bd9c24165956b9e17a223f80a187055..90047e886f72dfe27b56fce2320e772a43f18adf 100644
--- a/tests/test_InterpolateItemArray.cpp
+++ b/tests/test_InterpolateItemArray.cpp
@@ -46,7 +46,7 @@ TEST_CASE("InterpolateItemArray", "[language]")
     {
       constexpr size_t Dimension = 1;
 
-      const auto& mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      const auto& mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_1d).xj();
 
       std::string_view data = R"(
@@ -111,7 +111,7 @@ let scalar_non_linear_1d: R^1 -> R, x -> 2 * exp(x[0]) + 3;
     {
       constexpr size_t Dimension = 2;
 
-      const auto& mesh_2d = MeshDataBaseForTests::get().cartesianMesh2D();
+      const auto& mesh_2d = MeshDataBaseForTests::get().cartesian2DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_2d).xj();
 
       std::string_view data = R"(
@@ -176,7 +176,7 @@ let scalar_non_linear_2d: R^2 -> R, x -> 2*exp(x[0])*sin(x[1])+3;
     {
       constexpr size_t Dimension = 3;
 
-      const auto& mesh_3d = MeshDataBaseForTests::get().cartesianMesh3D();
+      const auto& mesh_3d = MeshDataBaseForTests::get().cartesian3DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_3d).xj();
 
       std::string_view data = R"(
@@ -255,7 +255,7 @@ let scalar_non_linear_3d: R^3 -> R, x -> 2 * exp(x[0]) * sin(x[1]) * x[2] + 3;
     {
       constexpr size_t Dimension = 1;
 
-      const auto& mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      const auto& mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_1d).xj();
 
       Array<const CellId> cell_id_list = [&] {
@@ -328,7 +328,7 @@ let scalar_non_linear_3d: R^3 -> R, x -> 2 * exp(x[0]) * sin(x[1]) * x[2] + 3;
     {
       constexpr size_t Dimension = 2;
 
-      const auto& mesh_2d = MeshDataBaseForTests::get().cartesianMesh2D();
+      const auto& mesh_2d = MeshDataBaseForTests::get().cartesian2DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_2d).xj();
 
       Array<CellId> cell_id_list{mesh_2d->numberOfCells() / 2};
@@ -398,7 +398,7 @@ let scalar_non_linear_2d: R^2 -> R, x -> 2*exp(x[0])*sin(x[1])+3;
     {
       constexpr size_t Dimension = 3;
 
-      const auto& mesh_3d = MeshDataBaseForTests::get().cartesianMesh3D();
+      const auto& mesh_3d = MeshDataBaseForTests::get().cartesian3DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_3d).xj();
 
       Array<CellId> cell_id_list{mesh_3d->numberOfCells() / 2};
diff --git a/tests/test_InterpolateItemValue.cpp b/tests/test_InterpolateItemValue.cpp
index fa786632c10660c9197842196440ae383a489edd..0cb4621874bc837b4d397920a048b6b7da2de083 100644
--- a/tests/test_InterpolateItemValue.cpp
+++ b/tests/test_InterpolateItemValue.cpp
@@ -43,7 +43,7 @@ TEST_CASE("InterpolateItemValue", "[language]")
     {
       constexpr size_t Dimension = 1;
 
-      const auto& mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      const auto& mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_1d).xj();
 
       std::string_view data = R"(
@@ -205,7 +205,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
     {
       constexpr size_t Dimension = 2;
 
-      const auto& mesh_2d = MeshDataBaseForTests::get().cartesianMesh2D();
+      const auto& mesh_2d = MeshDataBaseForTests::get().cartesian2DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_2d).xj();
 
       std::string_view data = R"(
@@ -361,7 +361,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
     {
       constexpr size_t Dimension = 3;
 
-      const auto& mesh_3d = MeshDataBaseForTests::get().cartesianMesh3D();
+      const auto& mesh_3d = MeshDataBaseForTests::get().cartesian3DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_3d).xj();
 
       std::string_view data = R"(
@@ -532,7 +532,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
     {
       constexpr size_t Dimension = 1;
 
-      const auto& mesh_1d = MeshDataBaseForTests::get().cartesianMesh1D();
+      const auto& mesh_1d = MeshDataBaseForTests::get().cartesian1DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_1d).xj();
 
       Array<const CellId> cell_id_list = [&] {
@@ -702,7 +702,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
     {
       constexpr size_t Dimension = 2;
 
-      const auto& mesh_2d = MeshDataBaseForTests::get().cartesianMesh2D();
+      const auto& mesh_2d = MeshDataBaseForTests::get().cartesian2DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_2d).xj();
 
       Array<CellId> cell_id_list{mesh_2d->numberOfCells() / 2};
@@ -864,7 +864,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
     {
       constexpr size_t Dimension = 3;
 
-      const auto& mesh_3d = MeshDataBaseForTests::get().cartesianMesh3D();
+      const auto& mesh_3d = MeshDataBaseForTests::get().cartesian3DMesh();
       auto xj             = MeshDataManager::instance().getMeshData(*mesh_3d).xj();
 
       Array<CellId> cell_id_list{mesh_3d->numberOfCells() / 2};
diff --git a/tests/test_ItemArray.cpp b/tests/test_ItemArray.cpp
index 17337200786737dcc7b98c75eb18021cfd62a82d..2cb868465d8b7144a9b325a364afd43fbde2d52f 100644
--- a/tests/test_ItemArray.cpp
+++ b/tests/test_ItemArray.cpp
@@ -28,7 +28,7 @@ TEST_CASE("ItemArray", "[mesh]")
 
   SECTION("1D")
   {
-    const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+    const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
     const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
     REQUIRE_NOTHROW(NodeArray<int>{connectivity, 3});
@@ -58,7 +58,7 @@ TEST_CASE("ItemArray", "[mesh]")
 
   SECTION("2D")
   {
-    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
     const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
     REQUIRE_NOTHROW(NodeArray<int>{connectivity, 2});
@@ -86,7 +86,7 @@ TEST_CASE("ItemArray", "[mesh]")
 
   SECTION("3D")
   {
-    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
     const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
     REQUIRE_NOTHROW(NodeArray<int>{connectivity, 3});
@@ -112,7 +112,7 @@ TEST_CASE("ItemArray", "[mesh]")
 
   SECTION("set values from array")
   {
-    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
     const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
     CellArray<size_t> cell_array{connectivity, 3};
@@ -155,7 +155,7 @@ TEST_CASE("ItemArray", "[mesh]")
       return is_same;
     };
 
-    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
     const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
     CellArray<int> cell_array{connectivity, 4};
@@ -182,7 +182,7 @@ TEST_CASE("ItemArray", "[mesh]")
 
   SECTION("WeakItemArray")
   {
-    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
     const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
     WeakFaceArray<int> weak_face_array{connectivity, 5};
@@ -214,7 +214,7 @@ TEST_CASE("ItemArray", "[mesh]")
 
     SECTION("checking for bounds violation")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       CellArray<int> cell_array{connectivity, 1};
@@ -236,7 +236,7 @@ TEST_CASE("ItemArray", "[mesh]")
 
     SECTION("set values from invalid array size")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       CellArray<size_t> cell_array{connectivity, 2};
diff --git a/tests/test_ItemArrayUtils.cpp b/tests/test_ItemArrayUtils.cpp
index 6eb6894d41aa3700fdc86e6c0d7c9d83acda328e..c746a22f5937a1d6180466c3b2333536002d29e5 100644
--- a/tests/test_ItemArrayUtils.cpp
+++ b/tests/test_ItemArrayUtils.cpp
@@ -19,7 +19,7 @@ TEST_CASE("ItemArrayUtils", "[mesh]")
   {
     SECTION("1D")
     {
-      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
       const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
       SECTION("node")
@@ -269,7 +269,7 @@ TEST_CASE("ItemArrayUtils", "[mesh]")
 
     SECTION("2D")
     {
-      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
       SECTION("node")
@@ -519,7 +519,7 @@ TEST_CASE("ItemArrayUtils", "[mesh]")
 
     SECTION("3D")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       SECTION("node")
diff --git a/tests/test_ItemValue.cpp b/tests/test_ItemValue.cpp
index 1c4ab49faf757cc0b2e871f9bf4e0ba33061ece7..cf0fe9f62eaa7f9816eab66e1859721ccc5d76be 100644
--- a/tests/test_ItemValue.cpp
+++ b/tests/test_ItemValue.cpp
@@ -26,7 +26,7 @@ TEST_CASE("ItemValue", "[mesh]")
 
   SECTION("1D")
   {
-    const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+    const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
     const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
     REQUIRE_NOTHROW(NodeValue<int>{connectivity});
@@ -51,7 +51,7 @@ TEST_CASE("ItemValue", "[mesh]")
 
   SECTION("2D")
   {
-    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
     const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
     REQUIRE_NOTHROW(NodeValue<int>{connectivity});
@@ -72,7 +72,7 @@ TEST_CASE("ItemValue", "[mesh]")
 
   SECTION("3D")
   {
-    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
     const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
     REQUIRE_NOTHROW(NodeValue<int>{connectivity});
@@ -88,7 +88,7 @@ TEST_CASE("ItemValue", "[mesh]")
 
   SECTION("set values from array")
   {
-    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
     const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
     CellValue<size_t> cell_value{connectivity};
@@ -107,7 +107,7 @@ TEST_CASE("ItemValue", "[mesh]")
 
   SECTION("copy")
   {
-    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
     const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
     CellValue<int> cell_value{connectivity};
@@ -129,7 +129,7 @@ TEST_CASE("ItemValue", "[mesh]")
 
   SECTION("WeakItemValue")
   {
-    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
     const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
     WeakFaceValue<int> weak_face_value{connectivity};
@@ -161,7 +161,7 @@ TEST_CASE("ItemValue", "[mesh]")
 
     SECTION("checking for bounds violation")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       CellValue<int> cell_value{connectivity};
@@ -183,7 +183,7 @@ TEST_CASE("ItemValue", "[mesh]")
 
     SECTION("set values from invalid array size")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       CellValue<size_t> cell_value{connectivity};
@@ -194,10 +194,10 @@ TEST_CASE("ItemValue", "[mesh]")
 
     SECTION("invalid copy_to")
     {
-      const Mesh<Connectivity<2>>& mesh_2d   = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d   = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity_2d = mesh_2d.connectivity();
 
-      const Mesh<Connectivity<3>>& mesh_3d   = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d   = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity_3d = mesh_3d.connectivity();
 
       CellValue<int> cell_2d_value{connectivity_2d};
diff --git a/tests/test_ItemValueUtils.cpp b/tests/test_ItemValueUtils.cpp
index b77dfecd58fe2aa2ee2addcc483f631f3e3ec62f..5c02d764da7798d6a74092ef12889797fa881e63 100644
--- a/tests/test_ItemValueUtils.cpp
+++ b/tests/test_ItemValueUtils.cpp
@@ -17,7 +17,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
 {
   SECTION("Synchronize")
   {
-    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
     const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
     WeakFaceValue<int> weak_face_value{connectivity};
@@ -57,7 +57,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
   {
     SECTION("1D")
     {
-      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
       const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
       CellValue<int> cell_value{connectivity};
@@ -76,7 +76,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
 
     SECTION("2D")
     {
-      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
       CellValue<int> cell_value{connectivity};
@@ -95,7 +95,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
 
     SECTION("3D")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       CellValue<int> cell_value{connectivity};
@@ -117,7 +117,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
   {
     SECTION("1D")
     {
-      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
       const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
       CellValue<size_t> cell_value{connectivity};
@@ -136,7 +136,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
 
     SECTION("2D")
     {
-      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
       CellValue<size_t> cell_value{connectivity};
@@ -155,7 +155,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
 
     SECTION("3D")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       CellValue<size_t> cell_value{connectivity};
@@ -177,7 +177,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
   {
     SECTION("1D")
     {
-      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
       const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
       CellValue<size_t> cell_value{connectivity};
@@ -198,7 +198,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
 
     SECTION("2D")
     {
-      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
       FaceValue<size_t> face_value{connectivity};
@@ -219,7 +219,7 @@ TEST_CASE("ItemValueUtils", "[mesh]")
 
     SECTION("3D")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       NodeValue<size_t> node_value{connectivity};
diff --git a/tests/test_SubItemArrayPerItem.cpp b/tests/test_SubItemArrayPerItem.cpp
index d1cb315046b5450e975b7ced5e795103bb6453ad..3caa8a5b957fd9f4a37f565d9826bee71b0d52a3 100644
--- a/tests/test_SubItemArrayPerItem.cpp
+++ b/tests/test_SubItemArrayPerItem.cpp
@@ -64,7 +64,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
 
     SECTION("1D")
     {
-      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
       const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
       SECTION("per cell")
@@ -178,7 +178,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
 
     SECTION("2D")
     {
-      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
       SECTION("per cell")
@@ -335,7 +335,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
     }
     SECTION("3D")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       SECTION("per cell")
@@ -524,7 +524,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
   {
     SECTION("1D")
     {
-      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
       const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
       EdgeArrayPerCell<size_t> edge_arrays_per_cell{connectivity, 3};
@@ -589,7 +589,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
 
     SECTION("2D")
     {
-      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
       CellArrayPerFace<size_t> cell_arrays_per_face{connectivity, 3};
@@ -653,7 +653,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
 
     SECTION("3D")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       FaceArrayPerNode<size_t> face_arrays_per_node{connectivity, 3};
@@ -717,7 +717,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
 
   SECTION("copy")
   {
-    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
     const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
     SECTION("classic")
@@ -818,7 +818,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
 
   SECTION("WeakSubItemArrayPerItem")
   {
-    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
     const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
     WeakFaceArrayPerCell<int> weak_face_array_per_cell{connectivity, 3};
@@ -889,7 +889,7 @@ TEST_CASE("SubItemArrayPerItem", "[mesh]")
 
     SECTION("checking for bounds violation")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       CellArrayPerFace<int> cell_array_per_face{connectivity, 3};
diff --git a/tests/test_SubItemValuePerItem.cpp b/tests/test_SubItemValuePerItem.cpp
index f9b71010b411c3a53b968703202882f1d4fd0df1..7521eb7c1c9e4c5cf6596cd0d3f4ea5abc4f071f 100644
--- a/tests/test_SubItemValuePerItem.cpp
+++ b/tests/test_SubItemValuePerItem.cpp
@@ -64,7 +64,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
 
     SECTION("1D")
     {
-      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
       const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
       SECTION("per cell")
@@ -172,7 +172,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
 
     SECTION("2D")
     {
-      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
       SECTION("per cell")
@@ -320,7 +320,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
 
     SECTION("3D")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       SECTION("per cell")
@@ -497,7 +497,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
   {
     SECTION("1D")
     {
-      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesianMesh1D();
+      const Mesh<Connectivity<1>>& mesh_1d = *MeshDataBaseForTests::get().cartesian1DMesh();
       const Connectivity<1>& connectivity  = mesh_1d.connectivity();
 
       EdgeValuePerCell<size_t> edge_values_per_cell{connectivity};
@@ -534,7 +534,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
 
     SECTION("2D")
     {
-      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+      const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
       const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
       CellValuePerFace<size_t> cell_values_per_face{connectivity};
@@ -570,7 +570,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
 
     SECTION("3D")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       FaceValuePerNode<size_t> face_values_per_node{connectivity};
@@ -608,7 +608,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
 
   SECTION("copy")
   {
-    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+    const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
     const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
     SECTION("classic")
@@ -698,7 +698,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
 
   SECTION("WeakSubItemValuePerItem")
   {
-    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesianMesh2D();
+    const Mesh<Connectivity<2>>& mesh_2d = *MeshDataBaseForTests::get().cartesian2DMesh();
     const Connectivity<2>& connectivity  = mesh_2d.connectivity();
 
     WeakFaceValuePerCell<int> weak_face_value_per_cell{connectivity};
@@ -758,7 +758,7 @@ TEST_CASE("SubItemValuePerItem", "[mesh]")
 
     SECTION("checking for bounds violation")
     {
-      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesianMesh3D();
+      const Mesh<Connectivity<3>>& mesh_3d = *MeshDataBaseForTests::get().cartesian3DMesh();
       const Connectivity<3>& connectivity  = mesh_3d.connectivity();
 
       CellValuePerFace<int> cell_value_per_face{connectivity};