diff --git a/dumux/decoupled/2p/2pindices.hh b/dumux/decoupled/2p/2pindices.hh
index 3d6e0067b791bf390f2209b686e57da854700573..41f18698adfd438ce969f03ec5c3cd45bb085774 100644
--- a/dumux/decoupled/2p/2pindices.hh
+++ b/dumux/decoupled/2p/2pindices.hh
@@ -118,7 +118,8 @@ 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 pressureEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
-    static const int pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
+    DUNE_DEPRECATED_MSG("use pressureEqIdx instead") 
+    static const int pressEqIdx = pressureEqIdx; //!< \deprecated
     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
@@ -156,7 +157,8 @@ 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 pressureEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
-    static const int pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
+    DUNE_DEPRECATED_MSG("use pressureEqIdx instead") 
+    static const int pressEqIdx = pressureEqIdx; //!< \deprecated
     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
@@ -196,7 +198,8 @@ 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 pressureEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
-    static const int pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
+    DUNE_DEPRECATED_MSG("use pressureEqIdx instead") 
+    static const int pressEqIdx = pressureEqIdx; //!< \deprecated
     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
@@ -234,7 +237,8 @@ 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 pressureEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
-    static const int pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
+    DUNE_DEPRECATED_MSG("use pressureEqIdx instead") 
+    static const int pressEqIdx = pressureEqIdx; //!< \deprecated
     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
@@ -272,7 +276,8 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSw, PVOffset> : p
 
     // indices of the equations
     static const int pressureEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
-    static const int pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
+    DUNE_DEPRECATED_MSG("use pressureEqIdx instead") 
+    static const int pressEqIdx = pressureEqIdx; //!< \deprecated
     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
 };
@@ -308,7 +313,8 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset>
 
     // indices of the equations
     static const int pressureEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
-    static const int pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
+    DUNE_DEPRECATED_MSG("use pressureEqIdx instead") 
+    static const int pressEqIdx = pressureEqIdx; //!< \deprecated
     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
 };