diff --git a/src/Core/Geometry/IndexedGeometry.cpp b/src/Core/Geometry/IndexedGeometry.cpp
index f22577a8f2a..e79eb955bd3 100644
--- a/src/Core/Geometry/IndexedGeometry.cpp
+++ b/src/Core/Geometry/IndexedGeometry.cpp
@@ -1,7 +1,8 @@
 #include <Core/Geometry/IndexedGeometry.hpp>
-#include <iterator>
 
-#include <typeinfo>
+#include <Core/Utils/TypesUtils.hpp>
+
+#include <iterator>
 
 namespace Ra {
 namespace Core {
@@ -142,7 +143,7 @@ MultiIndexedGeometry::getFirstLayerOccurrence( const LayerSemantic& semanticName
         if ( key.first.find( semanticName ) != key.first.end() ) {
 
             auto& tmp = *( value.second.get() );
-            std::cerr << "get typeinfo " << typeid( tmp ).name() << "\n";
+            std::cerr << "get typeinfo " << Utils::demangleType( tmp ) << "\n";
             return { key, *( value.second.get() ) };
         }
     }
@@ -234,7 +235,7 @@ MultiIndexedGeometry::addLayer( std::unique_ptr<GeometryIndexLayerBase>&& layer,
                                 const std::string& layerName ) {
 
     auto& tmp1 = *( layer.get() );
-    std::cerr << "add layer typeinfo " << typeid( tmp1 ).name() << "\n";
+    std::cerr << "add layer typeinfo " << Utils::demangleType( tmp1 ) << "\n";
     LayerKeyType key { layer->semantics(), layerName };
     auto elt             = std::make_pair( key, std::make_pair( false, std::move( layer ) ) );
     auto [pos, inserted] = m_indices.insert( std::move( elt ) );
@@ -247,7 +248,7 @@ MultiIndexedGeometry::addLayer( std::unique_ptr<GeometryIndexLayerBase>&& layer,
     /// If not inserted, the pointer is deleted. So the caller must ensure this possible
     /// deletion is safe before calling this method.
     auto& tmp = *( pos->second.second.get() );
-    std::cerr << "add layer inserted typeinfo " << typeid( tmp ).name() << "\n";
+    std::cerr << "add layer inserted typeinfo " << Utils::demangleType( tmp ) << "\n";
 
     return { inserted, *( pos->second.second ) };
 }
diff --git a/src/Engine/Data/Mesh.cpp b/src/Engine/Data/Mesh.cpp
index 676aaa5817f..5cc57807f1d 100644
--- a/src/Engine/Data/Mesh.cpp
+++ b/src/Engine/Data/Mesh.cpp
@@ -1,17 +1,16 @@
-#include "Core/Geometry/IndexedGeometry.hpp"
 #include <Engine/Data/Mesh.hpp>
 
-#include <numeric>
-
+#include <Core/Geometry/IndexedGeometry.hpp>
 #include <Core/Utils/Attribs.hpp>
 #include <Core/Utils/Log.hpp>
+#include <Core/Utils/TypesUtils.hpp>
 #include <Engine/Data/ShaderProgram.hpp>
 #include <Engine/OpenGL.hpp>
 
 #include <globjects/Buffer.h>
 #include <globjects/VertexArray.h>
 
-#include <typeinfo>
+#include <numeric>
 
 namespace Ra {
 namespace Engine {
@@ -222,8 +221,8 @@ void GeometryDisplayable::loadGeometry( Core::Geometry::MultiIndexedGeometry&& m
         std::cerr << layer.getSize() << " " << layer.getNumberOfComponents() << " "
                   << layer.getBufferSize() << "\n";
 
-        std::cerr << "type info " << typeid( layer ).name() << "\n";
-        std::cerr << "type info " << typeid( const Core::Geometry::QuadIndexLayer& ).name() << "\n";
+        std::cerr << "type info " << demangleType( layer ) << "\n";
+        std::cerr << "type info " << demangleType<const Core::Geometry::QuadIndexLayer&>() << "\n";
 
         const auto& quadLayer = dynamic_cast<const Core::Geometry::QuadIndexLayer&>( layer );
         std::cerr << "cast done\n";