diff --git a/dumux/boxmodels/2p2c/2p2cindices.hh b/dumux/boxmodels/2p2c/2p2cindices.hh
index 87a6588684c9853da987b9d38c8e255cb0c65c1c..027d758ccb4a57208ac29371c1e689b25728a179 100644
--- a/dumux/boxmodels/2p2c/2p2cindices.hh
+++ b/dumux/boxmodels/2p2c/2p2cindices.hh
@@ -151,8 +151,10 @@ public:
 
     // Equation indices
     static const int conti0EqIdx = PVOffset; //!< Index of the mass conservation equation for the first component
-    static const int DUMUX_DEPRECATED_MSG("use conti0EqIdx + componentIdx instead") contiLEqIdx = conti0EqIdx + wCompIdx; //!< Index of the mass conservation equation for the liquid's primary component
-    static const int DUMUX_DEPRECATED_MSG("use conti0EqIdx + componentIdx instead") contiGEqIdx = conti0EqIdx + nCompIdx; //!< Index of the mass conservation equation for the gas' primary component
+    static const int contiWEqIdx = conti0EqIdx + wCompIdx; //!< Index of the mass conservation equation for the liquid's primary component
+    static const int contiNEqIdx = conti0EqIdx + nCompIdx; //!< Index of the mass conservation equation for the gas' primary component
+    static const int DUMUX_DEPRECATED_MSG("use contiWEqIdx instead") contiLEqIdx = contiWEqIdx; //!< Index of the mass conservation equation for the liquid's primary component
+    static const int DUMUX_DEPRECATED_MSG("use contiNEqIdx instead") contiGEqIdx = contiNEqIdx; //!< Index of the mass conservation equation for the gas' primary component
 };
 
 // \}
diff --git a/dumux/boxmodels/2p2c/2p2clocalresidual.hh b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
index 959b25d50933677b5abc2877946a0e2937b491a1..2596a573b71d55c037248738613452f38507e6cf 100644
--- a/dumux/boxmodels/2p2c/2p2clocalresidual.hh
+++ b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
@@ -78,12 +78,12 @@ class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
     typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
     enum
     {
-        contiWEqIdx = Indices::contiLEqIdx,
-        contiNEqIdx = Indices::contiGEqIdx,
-        wPhaseIdx = Indices::lPhaseIdx,
-        nPhaseIdx = Indices::gPhaseIdx,
-        wCompIdx = Indices::lCompIdx,
-        nCompIdx = Indices::gCompIdx
+        contiWEqIdx = Indices::contiWEqIdx,
+        contiNEqIdx = Indices::contiNEqIdx,
+        wPhaseIdx = Indices::wPhaseIdx,
+        nPhaseIdx = Indices::nPhaseIdx,
+        wCompIdx = Indices::wCompIdx,
+        nCompIdx = Indices::nCompIdx
     };
 
     typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index 8f57fedb1a9d547d0250eb740979a21f28d0e384..d26d879ad4f73b356a89ea95a6928e8dc358f301 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -109,13 +109,13 @@ class TwoPTwoCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
         pressureIdx = Indices::pressureIdx,
         switchIdx = Indices::switchIdx,
 
-        wPhaseIdx = Indices::lPhaseIdx,
-        nPhaseIdx = Indices::gPhaseIdx,
-        wCompIdx = Indices::lCompIdx,
-        nCompIdx = Indices::gCompIdx,
+        wPhaseIdx = Indices::wPhaseIdx,
+        nPhaseIdx = Indices::nPhaseIdx,
+        wCompIdx = Indices::wCompIdx,
+        nCompIdx = Indices::nCompIdx,
 
-        wPhaseOnly = Indices::lPhaseOnly,
-        nPhaseOnly = Indices::gPhaseOnly,
+        wPhaseOnly = Indices::wPhaseOnly,
+        nPhaseOnly = Indices::nPhaseOnly,
         bothPhases = Indices::bothPhases,
 
         pwSn = TwoPTwoCFormulation::pwSn,