diff --git a/examples/1ptracer/README.md b/examples/1ptracer/README.md
index c343398dd0054a843cf1c3c3206d400f9d0f26bd..fd44e2706b4eef2fd5ee00e7ea5c1ba034534af2 100644
--- a/examples/1ptracer/README.md
+++ b/examples/1ptracer/README.md
@@ -284,7 +284,7 @@ struct EnableGridFluxVariablesCache<TypeTag, TTag::IncompressibleTest> { static
 We enable caching for the FV grid geometry
 ```cpp
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::IncompressibleTest> { static constexpr bool value = true; };
+struct EnableGridGeometryCache<TypeTag, TTag::IncompressibleTest> { static constexpr bool value = true; };
 ```
 The cache stores values that were already calculated for later usage. This makes the simulation faster.
 We leave the namespace Properties.
@@ -544,7 +544,7 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::TracerTest> { static conste
 template<class TypeTag>
 struct EnableGridFluxVariablesCache<TypeTag, TTag::TracerTest> { static constexpr bool value = true; };
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::TracerTest> { static constexpr bool value = true; };
+struct EnableGridGeometryCache<TypeTag, TTag::TracerTest> { static constexpr bool value = true; };
 ```
 We use the same grid as in the stationary one-phase model, a structured 2D grid:
 ```cpp
diff --git a/examples/1ptracer/problem_1p.hh b/examples/1ptracer/problem_1p.hh
index cd8caedb33d837adeecb818e87a056acae1ce424..b3c8d67478591be9e166b5ef92b2ea3bba432d84 100644
--- a/examples/1ptracer/problem_1p.hh
+++ b/examples/1ptracer/problem_1p.hh
@@ -101,7 +101,7 @@ template<class TypeTag>
 struct EnableGridFluxVariablesCache<TypeTag, TTag::IncompressibleTest> { static constexpr bool value = true; };
 // We enable caching for the FV grid geometry
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::IncompressibleTest> { static constexpr bool value = true; };
+struct EnableGridGeometryCache<TypeTag, TTag::IncompressibleTest> { static constexpr bool value = true; };
 //The cache stores values that were already calculated for later usage. This makes the simulation faster.
 // We leave the namespace Properties.
 }
diff --git a/examples/1ptracer/problem_tracer.hh b/examples/1ptracer/problem_tracer.hh
index 07f00277c6685c783e5b505d80934aed67cc3fe9..afb3cccafb9f4a8e50c6dfea949d8232a01bfb77 100644
--- a/examples/1ptracer/problem_tracer.hh
+++ b/examples/1ptracer/problem_tracer.hh
@@ -59,7 +59,7 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::TracerTest> { static conste
 template<class TypeTag>
 struct EnableGridFluxVariablesCache<TypeTag, TTag::TracerTest> { static constexpr bool value = true; };
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::TracerTest> { static constexpr bool value = true; };
+struct EnableGridGeometryCache<TypeTag, TTag::TracerTest> { static constexpr bool value = true; };
 
 // We use the same grid as in the stationary one-phase model, a structured 2D grid:
 template<class TypeTag>
diff --git a/examples/2pinfiltration/README.md b/examples/2pinfiltration/README.md
index a852ae6311f77a3da3f95e25d4546c96e2085d49..6627cf4d6b3db061f9901c539b7775ff94ccfa48 100644
--- a/examples/2pinfiltration/README.md
+++ b/examples/2pinfiltration/README.md
@@ -321,7 +321,7 @@ stores values that were already calculated for later usage. This makes the simul
   template<class TypeTag>
   struct EnableGridFluxVariablesCache<TypeTag, TTag::PointSourceExample> { static constexpr bool value = false; };
   template<class TypeTag>
-  struct EnableFVGridGeometryCache<TypeTag, TTag::PointSourceExample> { static constexpr bool value = false; };
+  struct EnableGridGeometryCache<TypeTag, TTag::PointSourceExample> { static constexpr bool value = false; };
 ```
 We leave the namespace Properties.
 ```cpp
diff --git a/examples/2pinfiltration/problem.hh b/examples/2pinfiltration/problem.hh
index f7ddfceef02c00a5bf21bdba455b2db32289cf1d..0c6344275b9a8b45a5659ef96fdd18a31b42ddd1 100644
--- a/examples/2pinfiltration/problem.hh
+++ b/examples/2pinfiltration/problem.hh
@@ -120,7 +120,7 @@ namespace Dumux {
   template<class TypeTag>
   struct EnableGridFluxVariablesCache<TypeTag, TTag::PointSourceExample> { static constexpr bool value = false; };
   template<class TypeTag>
-  struct EnableFVGridGeometryCache<TypeTag, TTag::PointSourceExample> { static constexpr bool value = false; };
+  struct EnableGridGeometryCache<TypeTag, TTag::PointSourceExample> { static constexpr bool value = false; };
 
   //We leave the namespace Properties.
   }
diff --git a/examples/shallowwaterfriction/README.md b/examples/shallowwaterfriction/README.md
index 7a4994cc8a5ee0b0fc497aebac4646fe2d4fa5e0..1209c19400cce0f4de95c2aacfa775242bfd34ec 100644
--- a/examples/shallowwaterfriction/README.md
+++ b/examples/shallowwaterfriction/README.md
@@ -269,7 +269,7 @@ We enable caching for the FV grid geometry and the grid volume variables. The ca
 stores values that were already calculated for later usage. This makes the simulation faster.
 ```cpp
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::RoughChannel>
+struct EnableGridGeometryCache<TypeTag, TTag::RoughChannel>
 { static constexpr bool value = true; };
 
 template<class TypeTag>
diff --git a/examples/shallowwaterfriction/problem.hh b/examples/shallowwaterfriction/problem.hh
index 8d7c55f968085cf13f71f0da8716cea775cf6114..eb9523df9cdaf68db0483053850ca4a8f9772849 100644
--- a/examples/shallowwaterfriction/problem.hh
+++ b/examples/shallowwaterfriction/problem.hh
@@ -81,7 +81,7 @@ public:
 // We enable caching for the FV grid geometry and the grid volume variables. The cache
 // stores values that were already calculated for later usage. This makes the simulation faster.
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::RoughChannel>
+struct EnableGridGeometryCache<TypeTag, TTag::RoughChannel>
 { static constexpr bool value = true; };
 
 template<class TypeTag>