diff --git a/src/language/modules/MeshModule.cpp b/src/language/modules/MeshModule.cpp
index 30505ad73aaf425dbebb3d76e326eaecb6e55fa6..da8eb6a69b00159c816b8fa2624071df6104bbab 100644
--- a/src/language/modules/MeshModule.cpp
+++ b/src/language/modules/MeshModule.cpp
@@ -8,7 +8,7 @@
 #include <language/utils/TypeDescriptor.hpp>
 #include <mesh/CartesianMeshBuilder.hpp>
 #include <mesh/Connectivity.hpp>
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 #include <mesh/GmshReader.hpp>
 #include <mesh/Mesh.hpp>
 #include <mesh/MeshRelaxer.hpp>
diff --git a/src/main.cpp b/src/main.cpp
index af8fd91292cb54845d0cea9d964feedf6d905484..7e03cdc8093c3b4034d24312b98a16a6f606b2d1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 #include <analysis/QuadratureManager.hpp>
 #include <language/PugsParser.hpp>
-#include <mesh/DiamondDualConnectivityManager.hpp>
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualConnectivityManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 #include <mesh/MeshDataManager.hpp>
 #include <mesh/SynchronizerManager.hpp>
 #include <utils/PugsUtils.hpp>
diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt
index 309e3323a435571b14d0e0d0f631675558c6314b..8f75c57d649b22f7ee7e63a6fb1af6f24aaefd61 100644
--- a/src/mesh/CMakeLists.txt
+++ b/src/mesh/CMakeLists.txt
@@ -8,9 +8,9 @@ add_library(
   ConnectivityComputer.cpp
   ConnectivityDispatcher.cpp
   DiamondDualConnectivityBuilder.cpp
-  DiamondDualConnectivityManager.cpp
   DiamondDualMeshBuilder.cpp
-  DiamondDualMeshManager.cpp
+  DualConnectivityManager.cpp
+  DualMeshManager.cpp
   GmshReader.cpp
   IConnectivity.cpp
   IMesh.cpp
diff --git a/src/mesh/DiamondDualMeshBuilder.cpp b/src/mesh/DiamondDualMeshBuilder.cpp
index a9a7ad786e4fdd4ff2c5cdd45f364d5d335911f8..175aadfa4562f8bb76967a4f26e6ab090c63acaa 100644
--- a/src/mesh/DiamondDualMeshBuilder.cpp
+++ b/src/mesh/DiamondDualMeshBuilder.cpp
@@ -3,7 +3,7 @@
 #include <mesh/Connectivity.hpp>
 #include <mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp>
 #include <mesh/DiamondDualConnectivityBuilder.hpp>
-#include <mesh/DiamondDualConnectivityManager.hpp>
+#include <mesh/DualConnectivityManager.hpp>
 #include <mesh/ItemValueUtils.hpp>
 #include <mesh/Mesh.hpp>
 #include <mesh/MeshData.hpp>
diff --git a/src/mesh/DiamondDualConnectivityManager.cpp b/src/mesh/DualConnectivityManager.cpp
similarity index 98%
rename from src/mesh/DiamondDualConnectivityManager.cpp
rename to src/mesh/DualConnectivityManager.cpp
index 1041b183e0b1970d40ba7a06f95a0f95d8ea5926..c3a2011d8b2f8517cf9072edf6dbbf75e4a4e2e3 100644
--- a/src/mesh/DiamondDualConnectivityManager.cpp
+++ b/src/mesh/DualConnectivityManager.cpp
@@ -3,7 +3,7 @@
 #include <mesh/Connectivity.hpp>
 #include <mesh/ConnectivityToDiamondDualConnectivityDataMapper.hpp>
 #include <mesh/DiamondDualConnectivityBuilder.hpp>
-#include <mesh/DiamondDualConnectivityManager.hpp>
+#include <mesh/DualConnectivityManager.hpp>
 #include <utils/Exceptions.hpp>
 
 #include <sstream>
diff --git a/src/mesh/DiamondDualConnectivityManager.hpp b/src/mesh/DualConnectivityManager.hpp
similarity index 95%
rename from src/mesh/DiamondDualConnectivityManager.hpp
rename to src/mesh/DualConnectivityManager.hpp
index 09608a568fad214df3117b4f63b130d5798eaefb..ef2812ea75c9271c3607d55d2414a7e45e27a245 100644
--- a/src/mesh/DiamondDualConnectivityManager.hpp
+++ b/src/mesh/DualConnectivityManager.hpp
@@ -1,5 +1,5 @@
-#ifndef DIAMOND_DUAL_CONNECTIVITY_MANAGER_HPP
-#define DIAMOND_DUAL_CONNECTIVITY_MANAGER_HPP
+#ifndef DUAL_CONNECTIVITY_MANAGER_HPP
+#define DUAL_CONNECTIVITY_MANAGER_HPP
 
 #include <mesh/IConnectivity.hpp>
 
@@ -91,4 +91,4 @@ class DualConnectivityManager
   getConnectivityToDiamondDualConnectivityDataMapper(const Connectivity<Dimension>&);
 };
 
-#endif   // DIAMOND_DUAL_CONNECTIVITY_MANAGER_HPP
+#endif   // DUAL_CONNECTIVITY_MANAGER_HPP
diff --git a/src/mesh/DiamondDualMeshManager.cpp b/src/mesh/DualMeshManager.cpp
similarity index 97%
rename from src/mesh/DiamondDualMeshManager.cpp
rename to src/mesh/DualMeshManager.cpp
index c14ae45f1d8b4d662724e2f0931d167afa8ff047..683cfbfb9c79af995c333b9b39ca05145f4bbe3c 100644
--- a/src/mesh/DiamondDualMeshManager.cpp
+++ b/src/mesh/DualMeshManager.cpp
@@ -1,4 +1,4 @@
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 
 #include <mesh/Connectivity.hpp>
 #include <mesh/DiamondDualMeshBuilder.hpp>
diff --git a/src/mesh/DiamondDualMeshManager.hpp b/src/mesh/DualMeshManager.hpp
similarity index 89%
rename from src/mesh/DiamondDualMeshManager.hpp
rename to src/mesh/DualMeshManager.hpp
index 7106e3ae28ccb00d8ba55587ba694e3cf03b76f7..5ae476ff314a00186a0dcc6bea12b87258508117 100644
--- a/src/mesh/DiamondDualMeshManager.hpp
+++ b/src/mesh/DualMeshManager.hpp
@@ -1,5 +1,5 @@
-#ifndef DIAMOND_DUAL_MESH_MANAGER_HPP
-#define DIAMOND_DUAL_MESH_MANAGER_HPP
+#ifndef DUAL_MESH_MANAGER_HPP
+#define DUAL_MESH_MANAGER_HPP
 
 #include <mesh/IMesh.hpp>
 #include <utils/PugsAssert.hpp>
@@ -52,4 +52,4 @@ class DualMeshManager
     std::shared_ptr<const Mesh<Connectivity<Dimension>>>);
 };
 
-#endif   // DIAMOND_DUAL_MESH_MANAGER_HPP
+#endif   // DUAL_MESH_MANAGER_HPP
diff --git a/src/mesh/IConnectivity.cpp b/src/mesh/IConnectivity.cpp
index f95214955d8192ed36b8fc65c0a19588ccb4310e..bc83c0298d57c99bdcde1d5f7f560ba77a9d05df 100644
--- a/src/mesh/IConnectivity.cpp
+++ b/src/mesh/IConnectivity.cpp
@@ -1,6 +1,6 @@
 #include <mesh/IConnectivity.hpp>
 
-#include <mesh/DiamondDualConnectivityManager.hpp>
+#include <mesh/DualConnectivityManager.hpp>
 #include <mesh/SynchronizerManager.hpp>
 
 IConnectivity::~IConnectivity()
diff --git a/src/mesh/IMesh.cpp b/src/mesh/IMesh.cpp
index cea6b1e4fe00f1fb04d22f873a09db3042c4d13f..e2a1739a8c6a928c0f29d6ef321d7c722f43ff65 100644
--- a/src/mesh/IMesh.cpp
+++ b/src/mesh/IMesh.cpp
@@ -1,6 +1,6 @@
 #include <mesh/IMesh.hpp>
 
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 #include <mesh/MeshDataManager.hpp>
 
 IMesh::~IMesh()
diff --git a/tests/mpi_test_main.cpp b/tests/mpi_test_main.cpp
index 860ec3560f0e202d98c39b6db9506959a7932bd6..93f3c7d908c7e4d3840231ba90278123e387a945 100644
--- a/tests/mpi_test_main.cpp
+++ b/tests/mpi_test_main.cpp
@@ -4,8 +4,8 @@
 
 #include <analysis/QuadratureManager.hpp>
 #include <language/utils/OperatorRepository.hpp>
-#include <mesh/DiamondDualConnectivityManager.hpp>
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualConnectivityManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 #include <mesh/MeshDataManager.hpp>
 #include <mesh/SynchronizerManager.hpp>
 #include <utils/Messenger.hpp>
diff --git a/tests/test_CellIntegrator.cpp b/tests/test_CellIntegrator.cpp
index 7559cb2c22a270a8615901a45bdfb0bc9caa7be6..a0f19555c110193a7805365cf16cfe9dfcfeb240 100644
--- a/tests/test_CellIntegrator.cpp
+++ b/tests/test_CellIntegrator.cpp
@@ -4,7 +4,7 @@
 #include <analysis/GaussLegendreQuadratureDescriptor.hpp>
 #include <analysis/GaussLobattoQuadratureDescriptor.hpp>
 #include <analysis/GaussQuadratureDescriptor.hpp>
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 #include <mesh/ItemValue.hpp>
 #include <mesh/Mesh.hpp>
 #include <scheme/CellIntegrator.hpp>
diff --git a/tests/test_EdgeIntegrator.cpp b/tests/test_EdgeIntegrator.cpp
index 0dc29d27d9260f2f1a92b6a48ea15dc70bb07173..dbfc74d49b630a32d24f8b1c81c0f92273698c38 100644
--- a/tests/test_EdgeIntegrator.cpp
+++ b/tests/test_EdgeIntegrator.cpp
@@ -4,7 +4,7 @@
 #include <analysis/GaussLegendreQuadratureDescriptor.hpp>
 #include <analysis/GaussLobattoQuadratureDescriptor.hpp>
 #include <analysis/GaussQuadratureDescriptor.hpp>
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 #include <mesh/ItemValue.hpp>
 #include <mesh/Mesh.hpp>
 #include <scheme/EdgeIntegrator.hpp>
diff --git a/tests/test_FaceIntegrator.cpp b/tests/test_FaceIntegrator.cpp
index 6d54d7f178d11a02bd94a3aa0bfb8b4e0ce30fb9..4afe3f9dc3c8573b1478ac06dc0ca9899956fc0c 100644
--- a/tests/test_FaceIntegrator.cpp
+++ b/tests/test_FaceIntegrator.cpp
@@ -4,7 +4,7 @@
 #include <analysis/GaussLegendreQuadratureDescriptor.hpp>
 #include <analysis/GaussLobattoQuadratureDescriptor.hpp>
 #include <analysis/GaussQuadratureDescriptor.hpp>
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 #include <mesh/ItemValue.hpp>
 #include <mesh/Mesh.hpp>
 #include <scheme/FaceIntegrator.hpp>
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index 5557e1ce4bb2e6f268ba084895cf564732a58456..91d9a080ae7fc9957a2088bd9213217b1d3d52f5 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -4,8 +4,8 @@
 
 #include <analysis/QuadratureManager.hpp>
 #include <language/utils/OperatorRepository.hpp>
-#include <mesh/DiamondDualConnectivityManager.hpp>
-#include <mesh/DiamondDualMeshManager.hpp>
+#include <mesh/DualConnectivityManager.hpp>
+#include <mesh/DualMeshManager.hpp>
 #include <mesh/MeshDataManager.hpp>
 #include <mesh/SynchronizerManager.hpp>
 #include <utils/Messenger.hpp>