diff --git a/dumux/porenetwork/2p/model.hh b/dumux/porenetwork/2p/model.hh
index 16591c003b4b0813a75e0586e7f5a3993b7dffeb..dc62bdea76e2691471d8a60fff450eae639e8aeb 100644
--- a/dumux/porenetwork/2p/model.hh
+++ b/dumux/porenetwork/2p/model.hh
@@ -108,7 +108,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
 
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of non-wetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
@@ -196,7 +196,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of non-wetting phase saturations
     using SR = Dumux::TwoPScvSaturationReconstruction<DM, enableIS>;
diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh
index da5b73bd5c1c7d9e49d9c74eb67397693e53e943..861af18674af687532b9344aff9aa89cdeb7d90f 100644
--- a/dumux/porousmediumflow/2p/model.hh
+++ b/dumux/porousmediumflow/2p/model.hh
@@ -179,8 +179,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
-
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
@@ -221,7 +220,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
diff --git a/dumux/porousmediumflow/2p/saturationreconstruction.hh b/dumux/porousmediumflow/2p/saturationreconstruction.hh
index 7a94627486ff4d541f523e2db2b43e3b367cb472..1ca95906d85f9b0b30f280823825428fadb86537 100644
--- a/dumux/porousmediumflow/2p/saturationreconstruction.hh
+++ b/dumux/porousmediumflow/2p/saturationreconstruction.hh
@@ -38,7 +38,7 @@ namespace Dumux {
  * freedom lie on material interfaces. There the nonwetting phase saturation is
  * generally discontinuous.
  */
-template<DiscretizationMethod M, bool enableReconstruction>
+template<class DiscretizationMethod, bool enableReconstruction>
 class TwoPScvSaturationReconstruction
 {
 public:
@@ -67,7 +67,7 @@ public:
 
 //! Specialization for the box scheme with the interface solver enabled
 template<>
-class TwoPScvSaturationReconstruction<DiscretizationMethod::box, /*enableReconstruction*/true>
+class TwoPScvSaturationReconstruction<DiscretizationMethods::Box, /*enableReconstruction*/true>
 {
 public:
     /*!
diff --git a/dumux/porousmediumflow/2p2c/model.hh b/dumux/porousmediumflow/2p2c/model.hh
index 1c7e87633cc33b02c6d0e05eb8108de0ac682898..b5128343d3db947adfcb8890f0873ceb4ccb1ea5 100644
--- a/dumux/porousmediumflow/2p2c/model.hh
+++ b/dumux/porousmediumflow/2p2c/model.hh
@@ -144,7 +144,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     static_assert(FSY::numComponents == 2, "Only fluid systems with 2 components are supported by the 2p2c model!");
     static_assert(FSY::numPhases == 2, "Only fluid systems with 2 phases are supported by the 2p2c model!");
@@ -195,7 +195,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
@@ -298,7 +298,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
@@ -368,7 +368,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh
index bc16441281972faa3c6ba034b547497807fe0507..ea496490a7f175d7689ea4520bab039907db7175 100644
--- a/dumux/porousmediumflow/2pnc/model.hh
+++ b/dumux/porousmediumflow/2pnc/model.hh
@@ -173,7 +173,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
@@ -271,7 +271,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
diff --git a/dumux/porousmediumflow/2pncmin/model.hh b/dumux/porousmediumflow/2pncmin/model.hh
index 3a73d713b70ab1ff9c02d862bb4761356cd9a9d9..9b76c16e99f0d58516783ebad50334dd51a15c10 100644
--- a/dumux/porousmediumflow/2pncmin/model.hh
+++ b/dumux/porousmediumflow/2pncmin/model.hh
@@ -136,7 +136,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
@@ -212,7 +212,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
diff --git a/dumux/porousmediumflow/co2/model.hh b/dumux/porousmediumflow/co2/model.hh
index bc48834f91ed387439f31e80d5e2885501ddaf80..79be63baced5eb40ebce6e24bb0f5d8ec9634bf1 100644
--- a/dumux/porousmediumflow/co2/model.hh
+++ b/dumux/porousmediumflow/co2/model.hh
@@ -69,7 +69,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
@@ -99,7 +99,7 @@ private:
     using SST = GetPropType<TypeTag, Properties::SolidState>;
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
+    using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;