diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index 7d43a9a6809bb1d4f9ea3590a04d3930bf799d0c..2edc1066410efb354b9c561dcd1028562f6938cd 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -40,7 +40,7 @@
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 
-#include "richardslensspatialparameters.hh"
+#include "richardslensspatialparams.hh"
 
 namespace Dumux
 {
@@ -53,7 +53,7 @@ class RichardsLensProblem;
 //////////
 namespace Properties
 {
-NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(BoxRichards, RichardsLensSpatialParameters));
+NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(BoxRichards, RichardsLensSpatialParams));
 
 // Set the grid type. Use UG if available, else SGrid
 #if HAVE_UG
@@ -206,7 +206,7 @@ public:
      */
     Scalar referencePressure(const Element &element,
                              const FVElementGeometry &fvElemGeom,
-                             int scvIdx) const
+                             const int scvIdx) const
     { return pnRef_; };
 
     void sourceAtPos(PrimaryVariables &values,
diff --git a/test/boxmodels/richards/richardslensspatialparameters.hh b/test/boxmodels/richards/richardslensspatialparams.hh
similarity index 94%
rename from test/boxmodels/richards/richardslensspatialparameters.hh
rename to test/boxmodels/richards/richardslensspatialparams.hh
index e9321b3f1c72a622a29a307b88c10eab34029a10..141d9d8d14fc4f0b3e611238655aeacf8bd97331 100644
--- a/test/boxmodels/richards/richardslensspatialparameters.hh
+++ b/test/boxmodels/richards/richardslensspatialparams.hh
@@ -30,7 +30,7 @@
 #ifndef DUMUX_RICHARDS_LENS_SPATIAL_PARAMETERS_HH
 #define DUMUX_RICHARDS_LENS_SPATIAL_PARAMETERS_HH
 
-#include <dumux/material/spatialparameters/boxspatialparameters.hh>
+#include <dumux/material/spatialparams/boxspatialparams.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -42,18 +42,18 @@ namespace Dumux
 
 //forward declaration
 template<class TypeTag>
-class RichardsLensSpatialParameters;
+class RichardsLensSpatialParams;
 
 namespace Properties
 {
 // The spatial parameters TypeTag
-NEW_TYPE_TAG(RichardsLensSpatialParameters);
+NEW_TYPE_TAG(RichardsLensSpatialParams);
 
 // Set the spatial parameters
-SET_TYPE_PROP(RichardsLensSpatialParameters, SpatialParams, Dumux::RichardsLensSpatialParameters<TypeTag>);
+SET_TYPE_PROP(RichardsLensSpatialParams, SpatialParams, Dumux::RichardsLensSpatialParams<TypeTag>);
 
 // Set the material Law
-SET_PROP(RichardsLensSpatialParameters, MaterialLaw)
+SET_PROP(RichardsLensSpatialParams, MaterialLaw)
 {
 private:
     // define the material law which is parameterized by effective
@@ -72,9 +72,9 @@ public:
  * \brief The spatial parameters for the RichardsLensProblem
  */
 template<class TypeTag>
-class RichardsLensSpatialParameters : public BoxSpatialParameters<TypeTag>
+class RichardsLensSpatialParams : 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;
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -102,7 +102,7 @@ public:
      * \param gridView The DUNE GridView representing the spatial
      *                 domain of the problem.
      */
-    RichardsLensSpatialParameters(const GridView& gridView)
+    RichardsLensSpatialParams(const GridView& gridView)
         : ParentType(gridView)
     {
         // residual saturations