diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index c47c17e24024ae4d49002b63cec92ef8fa12e944..87dc6b7558707374bc5cb0078952b324cff0b7f9 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -35,7 +35,7 @@
 #include <dumux/boxmodels/common/porousmediaboxproblem.hh>
 #include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
 
-#include "injectionspatialparameters.hh"
+#include "injectionspatialparams.hh"
 
 namespace Dumux
 {
@@ -45,7 +45,7 @@ class InjectionProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(InjectionProblem, INHERITS_FROM(BoxTwoPTwoC, InjectionSpatialParameters));
+NEW_TYPE_TAG(InjectionProblem, INHERITS_FROM(BoxTwoPTwoC, InjectionSpatialParams));
 
 // Set the grid type
 SET_PROP(InjectionProblem, Grid)
diff --git a/test/boxmodels/2p2c/injectionspatialparameters.hh b/test/boxmodels/2p2c/injectionspatialparams.hh
similarity index 95%
rename from test/boxmodels/2p2c/injectionspatialparameters.hh
rename to test/boxmodels/2p2c/injectionspatialparams.hh
index 6c49bfca6295e65526f5fe02c35deb33678eef8b..a9bf89171de5637097202495e834562439f619fb 100644
--- a/test/boxmodels/2p2c/injectionspatialparameters.hh
+++ b/test/boxmodels/2p2c/injectionspatialparams.hh
@@ -27,8 +27,8 @@
  *        problem which uses the isothermal 2p2c box model
  */
 
-#ifndef DUMUX_INJECTION_SPATIAL_PARAMETERS_HH
-#define DUMUX_INJECTION_SPATIAL_PARAMETERS_HH
+#ifndef DUMUX_INJECTION_SPATIAL_PARAMS_HH
+#define DUMUX_INJECTION_SPATIAL_PARAMS_HH
 
 #include <dumux/material/spatialparameters/boxspatialparameters.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
@@ -42,18 +42,18 @@ namespace Dumux
 
 //forward declaration
 template<class TypeTag>
-class InjectionSpatialParameters;
+class InjectionSpatialParams;
 
 namespace Properties
 {
 // The spatial parameters TypeTag
-NEW_TYPE_TAG(InjectionSpatialParameters);
+NEW_TYPE_TAG(InjectionSpatialParams);
 
 // Set the spatial parameters
-SET_TYPE_PROP(InjectionSpatialParameters, SpatialParams, Dumux::InjectionSpatialParameters<TypeTag>);
+SET_TYPE_PROP(InjectionSpatialParams, SpatialParams, Dumux::InjectionSpatialParams<TypeTag>);
 
 // Set the material Law
-SET_PROP(InjectionSpatialParameters, MaterialLaw)
+SET_PROP(InjectionSpatialParams, MaterialLaw)
 {
  private:
     // define the material law which is parameterized by effective
@@ -73,7 +73,7 @@ SET_PROP(InjectionSpatialParameters, MaterialLaw)
  *        problem which uses the isothermal 2p2c box model
  */
 template<class TypeTag>
-class InjectionSpatialParameters : public BoxSpatialParameters<TypeTag>
+class InjectionSpatialParams : public BoxSpatialParameters<TypeTag>
 {
     typedef BoxSpatialParameters<TypeTag> ParentType;
     typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
@@ -107,7 +107,7 @@ public:
      *
      * \param gridView The grid view
      */
-    InjectionSpatialParameters(const GridView &gridView)
+    InjectionSpatialParams(const GridView &gridView)
         : ParentType(gridView)
     {
         layerBottom_ = 22.0;
@@ -133,7 +133,7 @@ public:
         coarseMaterialParams_.setLambda(2.0);
     }
 
-    ~InjectionSpatialParameters()
+    ~InjectionSpatialParams()
     {}
 
     /*!
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index 8452bfbd27dad95a8a8a8dea7b9a4ad024d92bfe..e0c55d2259998d78c4fceefac8c78173562d4be0 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -38,7 +38,7 @@
 #include <dumux/boxmodels/2p2cni/2p2cnimodel.hh>
 #include <dumux/boxmodels/common/porousmediaboxproblem.hh>
 
-#include "waterairspatialparameters.hh"
+#include "waterairspatialparams.hh"
 
 #define ISOTHERMAL 0
 
@@ -49,7 +49,7 @@ class WaterAirProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(WaterAirProblem, INHERITS_FROM(BoxTwoPTwoCNI, WaterAirSpatialParameters));
+NEW_TYPE_TAG(WaterAirProblem, INHERITS_FROM(BoxTwoPTwoCNI, WaterAirSpatialParams));
 
 // Set the grid type
 SET_PROP(WaterAirProblem, Grid)
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparams.hh
similarity index 95%
rename from test/boxmodels/2p2cni/waterairspatialparameters.hh
rename to test/boxmodels/2p2cni/waterairspatialparams.hh
index 12b448a6ef1ad5a0a4fdd417bf8ebdfcb64dd87d..39e30853391901ae4ceb5e11169da2f1a9e00797 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparams.hh
@@ -25,8 +25,8 @@
  *
  * \brief Definition of the spatial parameters for the water-air problem.
  */
-#ifndef DUMUX_WATER_AIR_SPATIAL_PARAMETERS_HH
-#define DUMUX_WATER_AIR_SPATIAL_PARAMETERS_HH
+#ifndef DUMUX_WATER_AIR_SPATIAL_PARAMS_HH
+#define DUMUX_WATER_AIR_SPATIAL_PARAMS_HH
 
 #include <dumux/material/spatialparameters/boxspatialparameters.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
@@ -40,18 +40,18 @@ namespace Dumux
 
 //forward declaration
 template<class TypeTag>
-class WaterAirSpatialParameters;
+class WaterAirSpatialParams;
 
 namespace Properties
 {
 // The spatial parameters TypeTag
-NEW_TYPE_TAG(WaterAirSpatialParameters);
+NEW_TYPE_TAG(WaterAirSpatialParams);
 
 // Set the spatial parameters
-SET_TYPE_PROP(WaterAirSpatialParameters, SpatialParams, Dumux::WaterAirSpatialParameters<TypeTag>);
+SET_TYPE_PROP(WaterAirSpatialParams, SpatialParams, Dumux::WaterAirSpatialParams<TypeTag>);
 
 // Set the material Law
-SET_PROP(WaterAirSpatialParameters, MaterialLaw)
+SET_PROP(WaterAirSpatialParams, MaterialLaw)
 {
  private:
     // define the material law which is parameterized by effective
@@ -70,7 +70,7 @@ SET_PROP(WaterAirSpatialParameters, MaterialLaw)
  * \brief Definition of the spatial parameters for the water-air problem
  */
 template<class TypeTag>
-class WaterAirSpatialParameters : public BoxSpatialParameters<TypeTag>
+class WaterAirSpatialParams : public BoxSpatialParameters<TypeTag>
 {
     typedef BoxSpatialParameters<TypeTag> ParentType;
 
@@ -106,7 +106,7 @@ public:
      *
      * \param gridView The grid view
      */
-    WaterAirSpatialParameters(const GridView &gridView)
+    WaterAirSpatialParams(const GridView &gridView)
         : ParentType(gridView)
     {
         layerBottom_ = 22.0;
@@ -132,7 +132,7 @@ public:
         coarseMaterialParams_.setLambda(2.0);
     }
 
-    ~WaterAirSpatialParameters()
+    ~WaterAirSpatialParams()
     {}
 
     /*!