diff --git a/dumux/boxmodels/1p/1plocalresidual.hh b/dumux/boxmodels/1p/1plocalresidual.hh
index a29a479c289811674d648d43e6f3f2c332a6f654..57d1f1f9d829214a531ab9b3114a33731e0a6f94 100644
--- a/dumux/boxmodels/1p/1plocalresidual.hh
+++ b/dumux/boxmodels/1p/1plocalresidual.hh
@@ -59,8 +59,12 @@ class OnePLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
     typedef Dune::FieldVector<Scalar, dim> DimVector;
 
     typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+    //index of the mass balance equation
     enum {
         conti0EqIdx = Indices::conti0EqIdx, //index for the mass balance
+    };
+    //index of the primary variable
+    enum{
         pressureIdx = Indices::pressureIdx  //index for the primary variable
     };
 
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index 41fb6e0df21bb275a8fc48bcd690f0d6c1c95e72..a4f7a7b5b450fcddaff4e7a3db5bee00587ff0b7 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -72,24 +72,23 @@ protected:
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
 
-    enum
-        {
-            numEq = GET_PROP_VALUE(TypeTag, NumEq),
-
-            //phase index
-            phaseIdx = Indices::phaseIdx,
-            comp1Idx = Indices::comp1Idx,
-
-            // indices of the primary variables
-            pressuerIdx = Indices::pressureIdx,
-            transportCompIdx = Indices::transportCompIdx,
-
-            // indices of the equations
-            conti0EqIdx = Indices::conti0EqIdx,
-            contiEqIdx = conti0EqIdx, // \deprecated use conti0EqIdx
-            transportEqIdx = Indices::transportEqIdx,
-            transEqIdx = transportEqIdx //  \deprecated use transportEqIdx
-        };
+    enum {
+        numEq = GET_PROP_VALUE(TypeTag, NumEq),
+
+        //phase index
+        phaseIdx = Indices::phaseIdx,
+        comp1Idx = Indices::comp1Idx,
+    };
+    // indices of the primary variables
+    enum {
+        pressuerIdx = Indices::pressureIdx,
+        transportCompIdx = Indices::transportCompIdx,
+    };
+    // indices of the equations
+    enum {
+        conti0EqIdx = Indices::conti0EqIdx,
+        transportEqIdx = Indices::transportEqIdx
+    };
 
     //! property that defines whether mole or mass fractions are used
     static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
diff --git a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
index 8373cd093d43fd03a94d31e3021fd7f93f92e569..fb67a8ff4690b88bb8d35696170138ab279f1540 100644
--- a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
@@ -60,7 +60,9 @@ class OnePTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
         phaseIdx = Indices::phaseIdx,
         comp0Idx = Indices::comp0Idx,
         comp1Idx = Indices::comp1Idx,
-
+    };
+    //indices of primary variables
+    enum{
         pressureIdx = Indices::pressureIdx,
         transportCompIdx = Indices::transportCompIdx
     };
diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 82781ed37654ead1e185b5ff48c8893ed762b0e4..c624b318ab77f22ed6f9822a8dfa75e4019b073e 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -125,13 +125,13 @@ class OnePTestProblem : public PorousMediaBoxProblem<TypeTag>
         // Grid and world dimension
         dim = GridView::dimension,
         dimWorld = GridView::dimensionworld,
-
+    };
+    enum {
         // indices of the primary variables
         conti0EqIdx = Indices::conti0EqIdx,
         pressureIdx = Indices::pressureIdx
     };
 
-
     typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
     typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
     typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
diff --git a/test/boxmodels/1p2c/1p2coutflowproblem.hh b/test/boxmodels/1p2c/1p2coutflowproblem.hh
index 121a7a6bef44f9fc5bc6806e03540010d0e39103..f7f5346406706f915bc52970e718037c15ab8a43 100644
--- a/test/boxmodels/1p2c/1p2coutflowproblem.hh
+++ b/test/boxmodels/1p2c/1p2coutflowproblem.hh
@@ -132,11 +132,13 @@ class OnePTwoCOutflowProblem : public PorousMediaBoxProblem<TypeTag>
         // Grid and world dimension
         dim = GridView::dimension,
         dimWorld = GridView::dimensionworld,
-
+    };
+    enum {
         // indices of the primary variables
         pressureIdx = Indices::pressureIdx,
         transportCompIdx = Indices::transportCompIdx,
-
+    };
+    enum {
         // indices of the equations
         conti0EqIdx = Indices::conti0EqIdx,
         transportEqIdx = Indices::transportEqIdx