diff --git a/src/mesh/ItemValueSynchronizer.hpp b/src/mesh/ItemValueSynchronizer.hpp
index 610ac380c99bfe311164a951ce4759a82d9785b9..87b5c56c9c6a6469118d3618ecce1ed4bfc66729 100644
--- a/src/mesh/ItemValueSynchronizer.hpp
+++ b/src/mesh/ItemValueSynchronizer.hpp
@@ -1,12 +1,12 @@
-#ifndef ITEM_VALUE_SYNCHRONIZER_HPP
-#define ITEM_VALUE_SYNCHRONIZER_HPP
+#ifndef SYNCHRONIZER_HPP
+#define SYNCHRONIZER_HPP
 
 #include <ItemValue.hpp>
 #include <Connectivity.hpp>
 
 #include <map>
 
-class ItemValueSynchronizer
+class Synchronizer
 {
   template <ItemType item_type>
   using ExchangeItemTypeInfo = std::vector<Array<const ItemIdT<item_type>>>;
@@ -196,10 +196,10 @@ class ItemValueSynchronizer
   }
 
   PASTIS_INLINE
-  ItemValueSynchronizer()
+  Synchronizer()
   {
     ;
   }
 };
 
-#endif // ITEM_VALUE_SYNCHRONIZER_HPP
+#endif // SYNCHRONIZER_HPP
diff --git a/src/mesh/ItemValueUtils.hpp b/src/mesh/ItemValueUtils.hpp
index e0e1f9608a53578f579fbdda1bfaa9d9afd2d290..882c063b652c1517144994c55d5a0441552845a7 100644
--- a/src/mesh/ItemValueUtils.hpp
+++ b/src/mesh/ItemValueUtils.hpp
@@ -300,7 +300,7 @@ void synchronize(ItemValue<DataType, item_type, ConnectivityPtr>& item_value)
 {
   static_assert(not std::is_const_v<DataType>, "cannot synchronize ItemValue of const data");
   if (parallel::size() > 1) {
-    static ItemValueSynchronizer synchronizer;
+    static Synchronizer synchronizer;
     synchronizer.synchronize(item_value);
   }
 }