diff --git a/dumux/decoupled/1p/1pindices.hh b/dumux/decoupled/1p/1pindices.hh
index 70ece1d30c1dc0a2247bb01b871f52aa54bc4d55..c2bca671308519da17946c81ffdb9bc17963e0fc 100644
--- a/dumux/decoupled/1p/1pindices.hh
+++ b/dumux/decoupled/1p/1pindices.hh
@@ -38,7 +38,7 @@ namespace Dumux
 struct DecoupledOnePCommonIndices
 {
     // Formulations
-    static const int pressEqIdx = 0;//!< Index of the pressure equation
+    static const int pressureEqIdx = 0;//!< Index of the pressure equation
 };
 
 // \}
diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
index 387ab73931ab24932095f6c4765759a596969dd2..01e6f2538103d2ae44bb79f8fc6a03a5dcf98670 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
@@ -77,7 +77,7 @@ template<class TypeTag> class FVPressure1P: public FVPressure<TypeTag>
 
     enum
     {
-        pressEqIdx = Indices::pressEqIdx // only one equation!
+        pressEqIdx = Indices::pressureEqIdx // only one equation!
     };
 
     enum
diff --git a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
index 8fe94ba7b37f3d97068c54038929f1968c1e4f1e..94ee1dd09a057df046b25ecde2356de2d7cc831c 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
@@ -72,7 +72,7 @@ typedef typename GridView::IntersectionIterator IntersectionIterator;
 
     enum
     {
-        pressEqIdx = Indices::pressEqIdx // only one equation!
+        pressEqIdx = Indices::pressureEqIdx // only one equation!
     };
 
     typedef Dune::FieldVector<Scalar,dimWorld> GlobalPosition;
diff --git a/dumux/decoupled/2p/2pindices.hh b/dumux/decoupled/2p/2pindices.hh
index e259c9cc1b9d6f29c39bc1f407b912bdcce9aee6..699f1d5f4ff7bc226a5bbd71d49334458091a662 100644
--- a/dumux/decoupled/2p/2pindices.hh
+++ b/dumux/decoupled/2p/2pindices.hh
@@ -92,7 +92,7 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
 
     // indices of the equations
     static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
-    static const int pressEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
+    static const int pressureEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
     static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
     static const int satEqIdx = contiNEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
@@ -126,7 +126,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSw, PVOffset>
 
     // indices of the equations
     static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
-    static const int pressEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
+    static const int pressureEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
     static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase
     static const int satEqIdx = contiWEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
@@ -162,7 +162,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwSw, PVOffset>
 
     // indices of the equations
     static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
-    static const int pressEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
+    static const int pressureEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
     static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
     static const int satEqIdx = contiNEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
@@ -196,7 +196,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSn, PVOffset>
 
     // indices of the equations
     static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
-    static const int pressEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
+    static const int pressureEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
     static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase
     static const int satEqIdx = contiWEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
@@ -230,7 +230,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSw, PVOffset> : p
     //! \endcond
 
     // indices of the equations
-    static const int pressEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
+    static const int pressureEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
     static const int satEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
 };
@@ -262,7 +262,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset>
     //! \endcond
 
     // indices of the equations
-    static const int pressEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
+    static const int pressureEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
     static const int satEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
 };
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
index 80a1cadea76889136c46ca7e7872e3cb44418eaf..1b6deab794d2de198beca6ebec2518f01c5a1dd7 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
@@ -119,7 +119,7 @@ template<class TypeTag> class FVPressure2P: public FVPressure<TypeTag>
         Sn = Indices::saturationNW,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        eqIdxPress = Indices::pressEqIdx,
+        eqIdxPress = Indices::pressureEqIdx,
         eqIdxSat = Indices::satEqIdx
     };
     enum
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
index f50ff294acab75868ddf9143a8d8c40143d62273..a8d1fbfbec54686d355ea8f07aeae827276cf329 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
@@ -72,7 +72,7 @@ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag>
         Sn = Indices::saturationNW,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        eqIdxPress = Indices::pressEqIdx,
+        eqIdxPress = Indices::pressureEqIdx,
         eqIdxSat = Indices::satEqIdx
     };
     enum
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
index cfbd8224ae6d9cc7b44607288246eeb13ed71e0b..bfd1fb40205256d5c4f4abae1cace9c05e22dd9f 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
@@ -95,7 +95,7 @@ class FVVelocity2P
         Sn = Indices::saturationNW,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        eqIdxPress = Indices::pressEqIdx,
+        eqIdxPress = Indices::pressureEqIdx,
         eqIdxSat = Indices::satEqIdx
     };
     enum
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index c4a138d8438d4b7238092adf08304ef65c602581..0b0589d000aa135b9371e96ae2ad00853344424f 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -81,7 +81,7 @@ typedef typename GridView::Traits::template Codim<0>::Entity Element;
         Sn = Indices::saturationNW,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        eqIdxPress = Indices::pressEqIdx,
+        eqIdxPress = Indices::pressureEqIdx,
         eqIdxSat = Indices::satEqIdx
     };
     enum
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
index 8a208a4fb227cb2a99afb14da9444b50f87be1f7..7d69164c47f5d750985ab82a229398da562f560f 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
@@ -104,7 +104,7 @@ class FVMPFAL2PFABoundPressure2P: public FVPressure<TypeTag>
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
index 68bd72bbd57026de23106cc0407c1e0842fd15d5..1e87f12b7f3d22fb89750201e7256cd0afcd6812 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
@@ -106,7 +106,7 @@ class FVMPFAL2PFABoundPressure2PAdaptive: public FVPressure<TypeTag>
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
index 4fde768b1331d082a97056b719377b8948d81ac3..621f1869cd75a13bc1ed5309b01df9b2948886ed 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
@@ -107,7 +107,7 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2P: public FVMPFAL2PFABoun
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
index 7311eb4e8a02e26158cb4761dbabcb674bc3836a..35737cdf94b44fb6f2b18326d245ebd46c984454 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
@@ -109,7 +109,7 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2PAdaptive: public FVMPFAL
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
index 9d3c5e3e58c741b49da1a7c8cf1470368ffe4ab7..b9bd61d17c5ca86c29f5e14fde1d4f80441c051e 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
@@ -102,7 +102,7 @@ class FVMPFAO2PFABoundPressure2P: public FVPressure<TypeTag>
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
index 10162ec9e86e164c23d8cd84ed90d6d49b301335..8377c781a12d9dbb77200b3b0e70768381b83bbb 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
@@ -107,7 +107,7 @@ template<class TypeTag> class FVMPFAO2PFABoundVelocity2P: public FVMPFAO2PFABoun
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
index ae1a034f003764d8ddb7f9a796018b98a63f92c2..7fa0459b6b4d7bbbe188bc3ca274cd0b02b8ad79 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
@@ -97,7 +97,7 @@ class FVMPFAOPressure2P: public FVPressure<TypeTag>
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
index 10cf72303f0afab239d077e0b9a98588bbb9b8e1..7d9f1ec6030e5a4de1bd26c53eb0518fa638ed56 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
@@ -95,7 +95,7 @@ template<class TypeTag> class FVMPFAOVelocity2P:public FVMPFAOPressure2P<TypeTag
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
index aa347cfbe5b0ed5cc13e25ea847ed778feda187a..4555f69e0a21de61f3021f80e6113b62b3d12416 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
@@ -78,7 +78,7 @@ class MimeticGroundwaterEquationLocalStiffness: public LocalStiffness<TypeTag, 1
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
index 9fc6bcedf519e9604d411e11bee5032bb9eb9515..3ac486d0f59b6261448a19391116227ff6829ccb 100644
--- a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
+++ b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
@@ -69,7 +69,7 @@ private:
     enum
     {
         wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx,
-        pressEqIdx = Indices::pressEqIdx
+        pressEqIdx = Indices::pressureEqIdx
     };
 
     typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
index 62e6e81f64af6fcb1a8bb7131b30d0a2f037df84..aa959e4b2497afe46b01349eaefa7e5e89e885ed 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
@@ -60,7 +60,7 @@ private:
     enum
         {
             wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx,
-            eqIdxPress = Indices::pressEqIdx,
+            eqIdxPress = Indices::pressureEqIdx,
             eqIdxSat = Indices::satEqIdx,
             numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
         };
diff --git a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
index 78acf754750d2ec629cade4a9601326604cee283..195c3ee42373102ae4112ba19d4e80689ea46ea3 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
@@ -126,6 +126,7 @@ public:
     EvalCflFluxDefault (Problem& problem)
     : problem_(problem)
     {
+        porosityThreshold_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, PorosityThreshold);
         reset();
     }
 
@@ -222,6 +223,7 @@ private:
     Scalar fluxNonwettingOut_;
     Scalar fluxOut_;
     Scalar fluxIn_;
+    Scalar porosityThreshold_;
     static const int velocityType_ = GET_PROP_VALUE(TypeTag, VelocityFormulation);
     static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation);
 };
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index a6d501677f0d8f237f7a6950e65e30a9ff7e4d20..1105a31b032b1de0f3cb673d1919b04ef901c2ac 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -111,7 +111,7 @@ class FVSaturation2P: public FVTransport<TypeTag>
         nPhaseIdx = Indices::nPhaseIdx,
         pressureIdx = Indices::pressureIdx,
         saturationIdx = Indices::saturationIdx,
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
         satEqIdx = Indices::satEqIdx,
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
diff --git a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
index c9ef8a0c3359e01963c494bc78f4795635ba61ba..1b440752d5b6e5ecdd7a13cccee411d3687b7c1f 100644
--- a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
@@ -96,7 +96,7 @@ struct DecoupledTwoPTwoCIndicesAdaptive : public DecoupledTwoPTwoCIndices<TypeTa
 {
     static const int pressureIdx = 0;
     static const int saturationIdx = 0;
-    static const int pressEqIdx = 0;
+    static const int pressureEqIdx = 0;
     static const int satEqIdx = 0;
 };
 
diff --git a/dumux/decoupled/common/fv/fvpressure.hh b/dumux/decoupled/common/fv/fvpressure.hh
index cfa465d8e552c03d39090eeb38f296780127cd50..d3948660b12af4bb10e8eb7e681225d714da3737 100644
--- a/dumux/decoupled/common/fv/fvpressure.hh
+++ b/dumux/decoupled/common/fv/fvpressure.hh
@@ -92,7 +92,7 @@ protected:
 
     enum
     {
-        pressEqIdx = Indices::pressEqIdx,
+        pressEqIdx = Indices::pressureEqIdx,
     };
 
     //!Initialize the global matrix of the system of equations to solve