diff --git a/dumux/python/discretization/gridgeometry.hh b/dumux/python/discretization/gridgeometry.hh
index 619b1e468ca4113d2a46509b74429f8bf7f34a60..c2f26f29dc693dcd2ffd6b63646b9e4a2e1158a3 100644
--- a/dumux/python/discretization/gridgeometry.hh
+++ b/dumux/python/discretization/gridgeometry.hh
@@ -2,6 +2,7 @@
 #define DUMUX_PYTHON_DISCRETIZATION_GRIDGEOMETRY_HH
 
 #include <memory>
+#include <dune/common/classname.hh>
 #include <dune/python/pybind11/pybind11.h>
 #include <dune/python/common/typeregistry.hh>
 
@@ -16,7 +17,7 @@ void registerSubControlVolume(pybind11::handle scope)
 
     auto [cls, addedToRegistry] = insertClass<SCV>(
         scope, "SubControlVolume",
-        GenerateTypeName("SubControlVolume"),
+        GenerateTypeName(Dune::className<SCV>()),
         IncludeFiles{"dumux/python/discretization/gridgeometry.hh"}
     );
 
@@ -41,7 +42,7 @@ void registerSubControlVolumeFace(pybind11::handle scope)
 
     auto [cls, addedToRegistry] = insertClass<SCVF>(
         scope, "SubControlVolumeFace",
-        GenerateTypeName("SubControlVolumeFace"),
+        GenerateTypeName(Dune::className<SCVF>()),
         IncludeFiles{"dumux/python/discretization/gridgeometry.hh"}
     );
 
@@ -67,7 +68,7 @@ void registerFVElementGeometry(pybind11::handle scope)
 
     auto [cls, addedToRegistry] = insertClass<FVEG>(
         scope, "FVElementGeometry",
-        GenerateTypeName("FVElementGeometry"),
+        GenerateTypeName(Dune::className<FVEG>()),
         IncludeFiles{"dumux/python/discretization/gridgeometry.hh"}
     );