diff --git a/src/utils/checkpointing/CheckpointUtils.cpp b/src/utils/checkpointing/CheckpointUtils.cpp
index c72f70bfce487c82429da9a27c50f3dd5f853dd1..59b9f1db5508610c3c3dd74d53161d1e4d74e0f0 100644
--- a/src/utils/checkpointing/CheckpointUtils.cpp
+++ b/src/utils/checkpointing/CheckpointUtils.cpp
@@ -33,7 +33,7 @@
 #include <utils/checkpointing/IBoundaryConditionDescriptorHFType.hpp>
 #include <utils/checkpointing/IBoundaryDescriptorHFType.hpp>
 #include <utils/checkpointing/IInterfaceDescriptorHFType.hpp>
-#include <utils/checkpointing/INamedDiscreteDataHF.hpp>
+#include <utils/checkpointing/INamedDiscreteDataHFType.hpp>
 #include <utils/checkpointing/IWriterHFType.hpp>
 #include <utils/checkpointing/IZoneDescriptorHFType.hpp>
 #include <utils/checkpointing/ItemTypeHFType.hpp>
diff --git a/src/utils/checkpointing/DiscreteFunctionTypeHFType.hpp b/src/utils/checkpointing/DiscreteFunctionTypeHFType.hpp
index ae7e1cc90653ccb43db3993cdd3bb00915e270d3..55c22f98c4c76330584e46cf50ed1072fa22417d 100644
--- a/src/utils/checkpointing/DiscreteFunctionTypeHFType.hpp
+++ b/src/utils/checkpointing/DiscreteFunctionTypeHFType.hpp
@@ -9,6 +9,6 @@ create_enum_discrete_function_type()
 {
   return {{"P0", DiscreteFunctionType::P0}, {"P0Vector", DiscreteFunctionType::P0Vector}};
 }
-HIGHFIVE_REGISTER_TYPE(DiscreteFunctionType, create_enum_discrete_function_type);
+HIGHFIVE_REGISTER_TYPE(DiscreteFunctionType, create_enum_discrete_function_type)
 
 #endif   // DISCRETE_FUNCTION_TYPE_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/IBoundaryConditionDescriptorHFType.hpp b/src/utils/checkpointing/IBoundaryConditionDescriptorHFType.hpp
index f6854a5dfeb6a363bcedf3b343f8dea8935c0583..fb58b6d56557f34ab25d589f69d5de0444f4c242 100644
--- a/src/utils/checkpointing/IBoundaryConditionDescriptorHFType.hpp
+++ b/src/utils/checkpointing/IBoundaryConditionDescriptorHFType.hpp
@@ -18,6 +18,6 @@ create_enum_i_boundary_condition_descriptor_type()
           {"outflow", IBoundaryConditionDescriptor::Type::outflow},
           {"symmetry", IBoundaryConditionDescriptor::Type::symmetry}};
 }
-HIGHFIVE_REGISTER_TYPE(IBoundaryConditionDescriptor::Type, create_enum_i_boundary_condition_descriptor_type);
+HIGHFIVE_REGISTER_TYPE(IBoundaryConditionDescriptor::Type, create_enum_i_boundary_condition_descriptor_type)
 
 #endif   // I_BOUNDARY_CONDITION_DESCRIPTOR_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/IBoundaryDescriptorHFType.hpp b/src/utils/checkpointing/IBoundaryDescriptorHFType.hpp
index ea67598c7db32c2707812911069d944600eef99c..cc68000de638f530dea39ae6c90ce3e13767f36d 100644
--- a/src/utils/checkpointing/IBoundaryDescriptorHFType.hpp
+++ b/src/utils/checkpointing/IBoundaryDescriptorHFType.hpp
@@ -9,6 +9,6 @@ create_enum_i_boundary_descriptor_type()
 {
   return {{"named", IBoundaryDescriptor::Type::named}, {"numbered", IBoundaryDescriptor::Type::numbered}};
 }
-HIGHFIVE_REGISTER_TYPE(IBoundaryDescriptor::Type, create_enum_i_boundary_descriptor_type);
+HIGHFIVE_REGISTER_TYPE(IBoundaryDescriptor::Type, create_enum_i_boundary_descriptor_type)
 
 #endif   // I_BOUNDARY_DESCRIPTOR_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/IInterfaceDescriptorHFType.hpp b/src/utils/checkpointing/IInterfaceDescriptorHFType.hpp
index d099f2bb0511f0ecb4f5a7eecfeb33e484570b8a..5e4231ad3ae999a5ac262a47e17fd51e6fcdccc5 100644
--- a/src/utils/checkpointing/IInterfaceDescriptorHFType.hpp
+++ b/src/utils/checkpointing/IInterfaceDescriptorHFType.hpp
@@ -9,6 +9,6 @@ create_enum_i_interface_descriptor_type()
 {
   return {{"named", IInterfaceDescriptor::Type::named}, {"numbered", IInterfaceDescriptor::Type::numbered}};
 }
-HIGHFIVE_REGISTER_TYPE(IInterfaceDescriptor::Type, create_enum_i_interface_descriptor_type);
+HIGHFIVE_REGISTER_TYPE(IInterfaceDescriptor::Type, create_enum_i_interface_descriptor_type)
 
 #endif   // I_INTERFACE_DESCRIPTOR_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/INamedDiscreteDataHF.hpp b/src/utils/checkpointing/INamedDiscreteDataHFType.hpp
similarity index 95%
rename from src/utils/checkpointing/INamedDiscreteDataHF.hpp
rename to src/utils/checkpointing/INamedDiscreteDataHFType.hpp
index 9d775e5ea24e1f13fa7eb0afc6c4f600bd3390d7..a1bb006a9502db74bc218fec154d38ef9e647540 100644
--- a/src/utils/checkpointing/INamedDiscreteDataHF.hpp
+++ b/src/utils/checkpointing/INamedDiscreteDataHFType.hpp
@@ -11,6 +11,6 @@ create_enum_i_named_discrete_data_type()
           {"item_array", INamedDiscreteData::Type::item_array},
           {"item_value", INamedDiscreteData::Type::item_value}};
 }
-HIGHFIVE_REGISTER_TYPE(INamedDiscreteData::Type, create_enum_i_named_discrete_data_type);
+HIGHFIVE_REGISTER_TYPE(INamedDiscreteData::Type, create_enum_i_named_discrete_data_type)
 
 #endif   // I_NAMED_DISCRETE_DATA_HF_HPP
diff --git a/src/utils/checkpointing/IWriterHFType.hpp b/src/utils/checkpointing/IWriterHFType.hpp
index cb26891be92365a54c8ffda976554c14158705a7..7b6659bdccc8a1c58366a1e1ba5ad4b50c2806c9 100644
--- a/src/utils/checkpointing/IWriterHFType.hpp
+++ b/src/utils/checkpointing/IWriterHFType.hpp
@@ -9,6 +9,6 @@ create_enum_i_writer_type()
 {
   return {{"gnuplot", IWriter::Type::gnuplot}, {"gnuplot_1d", IWriter::Type::gnuplot_1d}, {"vtk", IWriter::Type::vtk}};
 }
-HIGHFIVE_REGISTER_TYPE(IWriter::Type, create_enum_i_writer_type);
+HIGHFIVE_REGISTER_TYPE(IWriter::Type, create_enum_i_writer_type)
 
 #endif   // I_WRITER_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/IZoneDescriptorHFType.hpp b/src/utils/checkpointing/IZoneDescriptorHFType.hpp
index 0b491aa922df3bbeef555c4cafe1f8d02d28d120..d1986624f3616329d882846e866b596d32fc1db5 100644
--- a/src/utils/checkpointing/IZoneDescriptorHFType.hpp
+++ b/src/utils/checkpointing/IZoneDescriptorHFType.hpp
@@ -9,6 +9,6 @@ create_enum_i_zone_descriptor_type()
 {
   return {{"named", IZoneDescriptor::Type::named}, {"numbered", IZoneDescriptor::Type::numbered}};
 }
-HIGHFIVE_REGISTER_TYPE(IZoneDescriptor::Type, create_enum_i_zone_descriptor_type);
+HIGHFIVE_REGISTER_TYPE(IZoneDescriptor::Type, create_enum_i_zone_descriptor_type)
 
 #endif   // I_ZONE_DESCRIPTOR_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/ItemTypeHFType.hpp b/src/utils/checkpointing/ItemTypeHFType.hpp
index e20d18861bb83d91a2048df82153f61d3c3159ff..714091e0c73ff55c42a5c59ee24a469495977c67 100644
--- a/src/utils/checkpointing/ItemTypeHFType.hpp
+++ b/src/utils/checkpointing/ItemTypeHFType.hpp
@@ -9,6 +9,6 @@ create_enum_item_type()
 {
   return {{"node", ItemType::node}, {"edge", ItemType::edge}, {"face", ItemType::face}, {"cell", ItemType::cell}};
 }
-HIGHFIVE_REGISTER_TYPE(ItemType, create_enum_item_type);
+HIGHFIVE_REGISTER_TYPE(ItemType, create_enum_item_type)
 
 #endif   // ITEM_TYPE_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/OStreamTypeHFType.hpp b/src/utils/checkpointing/OStreamTypeHFType.hpp
index 59bf5ddd06033b0e23153937549c3582928feb24..1c003d18b6312b78a90bb03124a0f9f267221da9 100644
--- a/src/utils/checkpointing/OStreamTypeHFType.hpp
+++ b/src/utils/checkpointing/OStreamTypeHFType.hpp
@@ -9,6 +9,6 @@ create_enum_ostream_type()
 {
   return {{"std_ostream", OStream::Type::std_ostream}, {"std_ofstream", OStream::Type::std_ofstream}};
 }
-HIGHFIVE_REGISTER_TYPE(OStream::Type, create_enum_ostream_type);
+HIGHFIVE_REGISTER_TYPE(OStream::Type, create_enum_ostream_type)
 
 #endif   // OSTREAM_TYPE_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/QuadratureTypeHFType.hpp b/src/utils/checkpointing/QuadratureTypeHFType.hpp
index 05fd325ca15e395c6233c237e8f927fb12409d78..3c73f7c72909876eae5f285fdab006ee2a59b111 100644
--- a/src/utils/checkpointing/QuadratureTypeHFType.hpp
+++ b/src/utils/checkpointing/QuadratureTypeHFType.hpp
@@ -11,6 +11,6 @@ create_enum_quadrature_descriptor_type()
           {"gauss-legendre", QuadratureType::GaussLegendre},
           {"gauss-lobatto", QuadratureType::GaussLobatto}};
 }
-HIGHFIVE_REGISTER_TYPE(QuadratureType, create_enum_quadrature_descriptor_type);
+HIGHFIVE_REGISTER_TYPE(QuadratureType, create_enum_quadrature_descriptor_type)
 
 #endif   // QUADRATURE_TYPE_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/RefItemListHFType.hpp b/src/utils/checkpointing/RefItemListHFType.hpp
index d5bc94c274b2f89ad8543608e1cce4669223a392..4491d4f52b4fd49f8e0d1cef2c88b1e0325f44ee 100644
--- a/src/utils/checkpointing/RefItemListHFType.hpp
+++ b/src/utils/checkpointing/RefItemListHFType.hpp
@@ -12,6 +12,6 @@ create_enum_ref_item_list_type()
           {"set", RefItemListBase::Type::set},
           {"undefined", RefItemListBase::Type::undefined}};
 }
-HIGHFIVE_REGISTER_TYPE(RefItemListBase::Type, create_enum_ref_item_list_type);
+HIGHFIVE_REGISTER_TYPE(RefItemListBase::Type, create_enum_ref_item_list_type)
 
 #endif   // REF_ITEM_LIST_HF_TYPE_HPP
diff --git a/src/utils/checkpointing/ResumeUtils.cpp b/src/utils/checkpointing/ResumeUtils.cpp
index 3b73a3b0310fa8521f25fd9274f39f47e1e3a959..fe77e200b6ce6bb9730cb6913eeb24a7eafbdad1 100644
--- a/src/utils/checkpointing/ResumeUtils.cpp
+++ b/src/utils/checkpointing/ResumeUtils.cpp
@@ -40,7 +40,7 @@
 #include <utils/checkpointing/IBoundaryConditionDescriptorHFType.hpp>
 #include <utils/checkpointing/IBoundaryDescriptorHFType.hpp>
 #include <utils/checkpointing/IInterfaceDescriptorHFType.hpp>
-#include <utils/checkpointing/INamedDiscreteDataHF.hpp>
+#include <utils/checkpointing/INamedDiscreteDataHFType.hpp>
 #include <utils/checkpointing/IWriterHFType.hpp>
 #include <utils/checkpointing/IZoneDescriptorHFType.hpp>
 #include <utils/checkpointing/ItemTypeHFType.hpp>