diff --git a/test/boxmodels/3p3c/infiltrationproblem.hh b/test/boxmodels/3p3c/infiltrationproblem.hh
index ff1a57841660ac6c17288cfc94bc0f306ec1f347..b0916862f73490d59762e5aa21d3ea1c8f12fda3 100644
--- a/test/boxmodels/3p3c/infiltrationproblem.hh
+++ b/test/boxmodels/3p3c/infiltrationproblem.hh
@@ -46,7 +46,7 @@ class InfiltrationProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(InfiltrationProblem, INHERITS_FROM(BoxThreePThreeC, InfiltrationSpatialParameters));
+NEW_TYPE_TAG(InfiltrationProblem, INHERITS_FROM(BoxThreePThreeC, InfiltrationSpatialParams));
 
 // Set the grid type
 SET_TYPE_PROP(InfiltrationProblem, Grid, Dune::YaspGrid<2>);
@@ -123,6 +123,10 @@ class InfiltrationProblem : public PorousMediaBoxProblem<TypeTag>
         // Phase State
         wgPhaseOnly = Indices::wgPhaseOnly,
 
+        contiWEqIdx = Indices::conti0EqIdx, //!< Index of the mass conservation equation for the water component
+        contiNEqIdx = Indices::conti1EqIdx,//!< Index of the mass conservation equation for the contaminant component
+        contiAEqIdx = Indices::conti2EqIdx,//!< Index of the mass conservation equation for the gas component
+
         // Grid and world dimension
         dim = GridView::dimension,
         dimWorld = GridView::dimensionworld
@@ -246,7 +250,7 @@ public:
             if (pc < 0.0) pc = 0.0;
 
             Sw = invertPCGW_(pc,
-                             this->spatialParameters().materialLawParams());
+                             this->spatialParams().materialLawParams());
             if (Sw < Swr) Sw = Swr;
             if (Sw > 1.-Sgr) Sw = 1.-Sgr;
 
@@ -260,7 +264,7 @@ public:
         }
 
         //initial_(values, globalPos, element);
-        //const MaterialLawParams& materialParams = this->spatialParameters().materialLawParams();;
+        //const MaterialLawParams& materialParams = this->spatialParams().materialLawParams();;
         //MaterialLaw::pCGW(materialParams, 1.0);
     }
 
@@ -291,9 +295,9 @@ public:
         // negative values for injection
         if ((globalPos[0] <= 75.+eps_) && (globalPos[0] >= 50.+eps_) && (globalPos[1] >= 10.-eps_))
         {
-            values[Indices::contiWEqIdx] = -0.0;
-            values[Indices::contiCEqIdx] = -0.001, // /*Molfluss, umr. über M(Mesit.)=0,120 kg/mol --> 1.2e-4  kg/(sm)
-                values[Indices::contiAEqIdx] = -0.0;
+            values[contiWEqIdx] = -0.0;
+            values[contiNEqIdx] = -0.001, // /*Molfluss, umr. über M(Mesit.)=0,120 kg/mol --> 1.2e-4  kg/(sm)
+            values[contiAEqIdx] = -0.0;
         }
     }
 
@@ -356,7 +360,7 @@ private:
             if (pc < 0.0) pc = 0.0;
 
             Sw = invertPCGW_(pc,
-                             this->spatialParameters().materialLawParams());
+                             this->spatialParams().materialLawParams());
             if (Sw < Swr) Sw = Swr;
             if (Sw > 1.-Sgr) Sw = 1.-Sgr;
 
diff --git a/test/boxmodels/3p3c/infiltrationspatialparameters.hh b/test/boxmodels/3p3c/infiltrationspatialparameters.hh
index b805aa958bd86348a402b0b44a2cea000ad87616..70015c3b3095d50eac4614b2930a8e5c50feeb33 100644
--- a/test/boxmodels/3p3c/infiltrationspatialparameters.hh
+++ b/test/boxmodels/3p3c/infiltrationspatialparameters.hh
@@ -39,18 +39,18 @@ namespace Dumux
 
 //forward declaration
 template<class TypeTag>
-class InfiltrationSpatialParameters;
+class InfiltrationSpatialParams;
 
 namespace Properties
 {
 // The spatial parameters TypeTag
-NEW_TYPE_TAG(InfiltrationSpatialParameters);
+NEW_TYPE_TAG(InfiltrationSpatialParams);
 
 // Set the spatial parameters
-SET_TYPE_PROP(InfiltrationSpatialParameters, SpatialParams, Dumux::InfiltrationSpatialParameters<TypeTag>);
+SET_TYPE_PROP(InfiltrationSpatialParams, SpatialParams, Dumux::InfiltrationSpatialParams<TypeTag>);
 
 // Set the material Law
-SET_PROP(InfiltrationSpatialParameters, MaterialLaw)
+SET_PROP(InfiltrationSpatialParams, MaterialLaw)
 {
  private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -66,9 +66,9 @@ SET_PROP(InfiltrationSpatialParameters, MaterialLaw)
  * \brief Definition of the spatial parameters for the infiltration problem
  */
 template<class TypeTag>
-class InfiltrationSpatialParameters : public BoxSpatialParameters<TypeTag>
+class InfiltrationSpatialParams : public BoxSpatialParams<TypeTag>
 {
-    typedef BoxSpatialParameters<TypeTag> ParentType;
+    typedef BoxSpatialParams<TypeTag> ParentType;
 
     typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
     typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -108,7 +108,7 @@ public:
      *
      * \param gv The grid view
      */
-    InfiltrationSpatialParameters(const GridView &gv)
+    InfiltrationSpatialParams(const GridView &gv)
         : ParentType(gv)
     {
         // intrinsic permeabilities
@@ -134,7 +134,7 @@ public:
         MaterialParams_.setRhoBulk(1500.);
     }
 
-    ~InfiltrationSpatialParameters()
+    ~InfiltrationSpatialParams()
     {}