diff --git a/dumux/discretization/box/fvelementgeometry.hh b/dumux/discretization/box/fvelementgeometry.hh
index 2b8c535900139f0f69a837a5ae4f769ad73b849f..00fbcbdc0a30280194009c1fafa91c51638e1d61 100644
--- a/dumux/discretization/box/fvelementgeometry.hh
+++ b/dumux/discretization/box/fvelementgeometry.hh
@@ -64,10 +64,7 @@ class BoxFVElementGeometry<GG, true>
     using CoordScalar = typename GridView::ctype;
     using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
     using GGCache = typename GG::Cache;
-
-    using GeometryHelper = BoxGeometryHelper<GridView, dim,
-                                             typename GG::SubControlVolume,
-                                             typename GG::SubControlVolumeFace>;
+    using GeometryHelper = typename GG::GeometryHelper;
 public:
     //! export the element type
     using Element = typename GridView::template Codim<0>::Entity;
@@ -244,10 +241,7 @@ class BoxFVElementGeometry<GG, false>
     using CoordScalar = typename GridView::ctype;
     using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
     using GGCache = typename GG::Cache;
-
-    using GeometryHelper = BoxGeometryHelper<GridView, dim,
-                                             typename GG::SubControlVolume,
-                                             typename GG::SubControlVolumeFace>;
+    using GeometryHelper = typename GG::GeometryHelper;
 public:
     //! export the element type
     using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/discretization/facecentered/diamond/fvelementgeometry.hh b/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
index 22a7430b9fe45b034b355311c0c73deab9eca9d1..7879dd8b657c575a4bd9f381a041057c5033bf35 100644
--- a/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
+++ b/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
@@ -56,7 +56,7 @@ class FaceCenteredDiamondFVElementGeometry<GG, /*cachingEnabled*/true>
     using LocalIndexType = typename IndexTraits<GridView>::SmallLocalIndex;
     using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
     using GGCache = typename GG::Cache;
-    using GeometryHelper = DiamondGeometryHelper<GridView, typename GG::SubControlVolume, typename GG::SubControlVolumeFace>;
+    using GeometryHelper = typename GG::GeometryHelper;
 
 public:
     //! export type of subcontrol volume face
diff --git a/dumux/discretization/pq1bubble/fvelementgeometry.hh b/dumux/discretization/pq1bubble/fvelementgeometry.hh
index 19952fa03eb1ceddd253f5c51a5f7efacf32b005..3e0ee3de0dde8d9fce83dd949315aab006bca8ec 100644
--- a/dumux/discretization/pq1bubble/fvelementgeometry.hh
+++ b/dumux/discretization/pq1bubble/fvelementgeometry.hh
@@ -63,7 +63,7 @@ class PQ1BubbleFVElementGeometry<GG, true>
     using CoordScalar = typename GridView::ctype;
     using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
     using GGCache = typename GG::Cache;
-    using GeometryHelper = PQ1BubbleGeometryHelper<GridView, typename GG::SubControlVolume, typename GG::SubControlVolumeFace>;
+    using GeometryHelper = typename GG::GeometryHelper;
 public:
     //! export the element type
     using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/multidomain/facet/box/fvelementgeometry.hh b/dumux/multidomain/facet/box/fvelementgeometry.hh
index 2e635386d067c30cf4abfbb75c04dd37987ba9f4..ffb3f4a61b0f390f5c003d717035ab1d32617db4 100644
--- a/dumux/multidomain/facet/box/fvelementgeometry.hh
+++ b/dumux/multidomain/facet/box/fvelementgeometry.hh
@@ -191,9 +191,7 @@ class BoxFacetCouplingFVElementGeometry<GG, false>
     using CoordScalar = typename GridView::ctype;
     using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
 
-    using GeometryHelper = BoxGeometryHelper<GridView, dim,
-                                             typename GG::SubControlVolume,
-                                             typename GG::SubControlVolumeFace>;
+    using GeometryHelper = typename GG::GeometryHelper;
 public:
     //! export type of the element
     using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
index 152ec1fce172d41b9f205c136d2bda46b7ec8d35..3879a989c79b2901a1eac913d9adbb13d8b17a95 100644
--- a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
+++ b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
@@ -202,9 +202,7 @@ class BoxDfmFVElementGeometry<GG, false>
 
     using CoordScalar = typename GridView::ctype;
     using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
-    using GeometryHelper = BoxDfmGeometryHelper<GridView, dim,
-                                                typename GG::SubControlVolume,
-                                                typename GG::SubControlVolumeFace>;
+    using GeometryHelper = typename GG::GeometryHelper;
 public:
     //! export type of the element
     using Element = typename GridView::template Codim<0>::Entity;