diff --git a/tutorial/tutorialproblem_coupled.hh b/tutorial/tutorialproblem_coupled.hh
index ec4927dfb45e5acdad45936c5eba9dee60a7dc5d..d048afc4d4aa40e4786937fc2c289ed04743b7da 100644
--- a/tutorial/tutorialproblem_coupled.hh
+++ b/tutorial/tutorialproblem_coupled.hh
@@ -38,7 +38,7 @@
 #include <dune/grid/yaspgrid.hh>
 
 // Spatially dependent parameters
-#include "tutorialspatialparameters_coupled.hh"
+#include "tutorialspatialparams_coupled.hh"
 
 // The components that are used
 #include <dumux/material/components/h2o.hh>
@@ -52,7 +52,7 @@ class TutorialProblemCoupled;
 
 namespace Properties {
 // Create a new type tag for the problem
-NEW_TYPE_TAG(TutorialProblemCoupled, INHERITS_FROM(BoxTwoP, TutorialSpatialParametersCoupled)); /*@\label{tutorial-coupled:create-type-tag}@*/
+NEW_TYPE_TAG(TutorialProblemCoupled, INHERITS_FROM(BoxTwoP, TutorialSpatialParamsCoupled)); /*@\label{tutorial-coupled:create-type-tag}@*/
 
 // Set the "Problem" property
 SET_PROP(TutorialProblemCoupled, Problem) /*@\label{tutorial-coupled:set-problem}@*/
diff --git a/tutorial/tutorialspatialparameters_coupled.hh b/tutorial/tutorialspatialparams_coupled.hh
similarity index 90%
rename from tutorial/tutorialspatialparameters_coupled.hh
rename to tutorial/tutorialspatialparams_coupled.hh
index 283f8567203174b848b938fb988d02a7dd0e0dc5..2354a988e1fd9cc26e3ce910577328a8aeb1c891 100644
--- a/tutorial/tutorialspatialparameters_coupled.hh
+++ b/tutorial/tutorialspatialparams_coupled.hh
@@ -25,8 +25,8 @@
  * \brief The spatial parameters for the fully coupled tutorial problem
  *        which uses the twophase box model.
  */
-#ifndef DUMUX_TUTORIAL_SPATIAL_PARAMETERS_COUPLED_HH
-#define DUMUX_TUTORIAL_SPATIAL_PARAMETERS_COUPLED_HH
+#ifndef DUMUX_TUTORIAL_SPATIAL_PARAMS_COUPLED_HH
+#define DUMUX_TUTORIAL_SPATIAL_PARAMS_COUPLED_HH
 
 // include parent spatialparameters
 #include <dumux/material/spatialparameters/boxspatialparameters.hh>
@@ -38,19 +38,19 @@
 namespace Dumux {
 //forward declaration
 template<class TypeTag>
-class TutorialSpatialParametersCoupled;
+class TutorialSpatialParamsCoupled;
 
 namespace Properties
 {
 // The spatial parameters TypeTag
-NEW_TYPE_TAG(TutorialSpatialParametersCoupled);/*@\label{tutorial-coupled:define-spatialparameters-typetag}@*/
+NEW_TYPE_TAG(TutorialSpatialParamsCoupled);/*@\label{tutorial-coupled:define-spatialparameters-typetag}@*/
 
 // Set the spatial parameters
-SET_TYPE_PROP(TutorialSpatialParametersCoupled, SpatialParams,
-        Dumux::TutorialSpatialParametersCoupled<TypeTag>); /*@\label{tutorial-coupled:set-spatialparameters}@*/
+SET_TYPE_PROP(TutorialSpatialParamsCoupled, SpatialParams,
+        Dumux::TutorialSpatialParamsCoupled<TypeTag>); /*@\label{tutorial-coupled:set-spatialparameters}@*/
 
 // Set the material law
-SET_PROP(TutorialSpatialParametersCoupled, MaterialLaw)
+SET_PROP(TutorialSpatialParamsCoupled, MaterialLaw)
 {
 private:
     // material law typedefs
@@ -70,7 +70,7 @@ public:
  *        which uses the twophase box model.
  */
 template<class TypeTag>
-class TutorialSpatialParametersCoupled: public BoxSpatialParameters<TypeTag> /*@\label{tutorial-coupled:tutorialSpatialParameters}@*/
+class TutorialSpatialParamsCoupled: public BoxSpatialParameters<TypeTag> /*@\label{tutorial-coupled:tutorialSpatialParameters}@*/
 {
     // Get informations for current implementation via property system
     typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
@@ -143,7 +143,7 @@ public:
     }
 
     // constructor
-    TutorialSpatialParametersCoupled(const GridView& gridView) :
+    TutorialSpatialParamsCoupled(const GridView& gridView) :
         BoxSpatialParameters<TypeTag>(gridView),
         K_(0)
     {