diff --git a/exercises/exercise-basic/injection2pspatialparams.hh b/exercises/exercise-basic/injection2pspatialparams.hh
index 5cc960a3902c0d01801ff9e0e7d61c7021cc0b49..8ef10ceb44b61ee5c2693098cbd4ed873a2044d6 100644
--- a/exercises/exercise-basic/injection2pspatialparams.hh
+++ b/exercises/exercise-basic/injection2pspatialparams.hh
@@ -41,13 +41,13 @@ namespace Dumux {
  *        which uses the isothermal two-phase two-component
  *        fully implicit model.
  */
-template<class FVGridGeometry, class Scalar>
+template<class GridGeometry, class Scalar>
 class InjectionSpatialParams
-: public FVPorousMediumFlowSpatialParamsMP<FVGridGeometry, Scalar, InjectionSpatialParams<FVGridGeometry, Scalar>>
+: public FVPorousMediumFlowSpatialParamsMP<GridGeometry, Scalar, InjectionSpatialParams<GridGeometry, Scalar>>
 {
-    using ThisType = InjectionSpatialParams<FVGridGeometry, Scalar>;
-    using ParentType = FVPorousMediumFlowSpatialParamsMP<FVGridGeometry, Scalar, ThisType>;
-    using GridView = typename FVGridGeometry::GridView;
+    using ThisType = InjectionSpatialParams<GridGeometry, Scalar>;
+    using ParentType = FVPorousMediumFlowSpatialParamsMP<GridGeometry, Scalar, ThisType>;
+    using GridView = typename GridGeometry::GridView;
 
     // get the dimensions of the simulation domain from GridView
     static const int dimWorld = GridView::dimensionworld;
@@ -63,10 +63,10 @@ public:
     /*!
      * \brief The constructor
      *
-     * \param fvGridGeometry The finite volume grid geometry
+     * \param gridGeometry The finite volume grid geometry
      */
-    InjectionSpatialParams(std::shared_ptr<const FVGridGeometry>& fvGridGeometry)
-    : ParentType(fvGridGeometry)
+    InjectionSpatialParams(std::shared_ptr<const GridGeometry>& gridGeometry)
+    : ParentType(gridGeometry)
     , aquitardPcKrSwCurve_("SpatialParams.Aquitard")
     , aquiferPcKrSwCurve_("SpatialParams.Aquifer")
     {
diff --git a/exercises/solution/exercise-basic/injection2pspatialparams.hh b/exercises/solution/exercise-basic/injection2pspatialparams.hh
index 5cc960a3902c0d01801ff9e0e7d61c7021cc0b49..8ef10ceb44b61ee5c2693098cbd4ed873a2044d6 100644
--- a/exercises/solution/exercise-basic/injection2pspatialparams.hh
+++ b/exercises/solution/exercise-basic/injection2pspatialparams.hh
@@ -41,13 +41,13 @@ namespace Dumux {
  *        which uses the isothermal two-phase two-component
  *        fully implicit model.
  */
-template<class FVGridGeometry, class Scalar>
+template<class GridGeometry, class Scalar>
 class InjectionSpatialParams
-: public FVPorousMediumFlowSpatialParamsMP<FVGridGeometry, Scalar, InjectionSpatialParams<FVGridGeometry, Scalar>>
+: public FVPorousMediumFlowSpatialParamsMP<GridGeometry, Scalar, InjectionSpatialParams<GridGeometry, Scalar>>
 {
-    using ThisType = InjectionSpatialParams<FVGridGeometry, Scalar>;
-    using ParentType = FVPorousMediumFlowSpatialParamsMP<FVGridGeometry, Scalar, ThisType>;
-    using GridView = typename FVGridGeometry::GridView;
+    using ThisType = InjectionSpatialParams<GridGeometry, Scalar>;
+    using ParentType = FVPorousMediumFlowSpatialParamsMP<GridGeometry, Scalar, ThisType>;
+    using GridView = typename GridGeometry::GridView;
 
     // get the dimensions of the simulation domain from GridView
     static const int dimWorld = GridView::dimensionworld;
@@ -63,10 +63,10 @@ public:
     /*!
      * \brief The constructor
      *
-     * \param fvGridGeometry The finite volume grid geometry
+     * \param gridGeometry The finite volume grid geometry
      */
-    InjectionSpatialParams(std::shared_ptr<const FVGridGeometry>& fvGridGeometry)
-    : ParentType(fvGridGeometry)
+    InjectionSpatialParams(std::shared_ptr<const GridGeometry>& gridGeometry)
+    : ParentType(gridGeometry)
     , aquitardPcKrSwCurve_("SpatialParams.Aquitard")
     , aquiferPcKrSwCurve_("SpatialParams.Aquifer")
     {