diff --git a/test/decoupled/1p/benchmarkresult.hh b/test/decoupled/1p/benchmarkresult.hh
index a007ea06a336e2f54c5d831b1858bd75668031f7..50a726dde04254b47d31cdcd7b1571b232e8e204 100644
--- a/test/decoupled/1p/benchmarkresult.hh
+++ b/test/decoupled/1p/benchmarkresult.hh
@@ -194,7 +194,7 @@ public:
             sumf += volume*(problem.source(global, element, local)[0]);
 
             // get the absolute permeability
-            Dune::FieldMatrix<double,dim,dim> K = problem.spatialParameters().K(global, element, local);
+            Dune::FieldMatrix<double,dim,dim> K = problem.spatialParams().K(global, element, local);
 
             numerator += volume*(exactValue - approximateValue)*(exactValue - approximateValue);
             denominator += volume*exactValue*exactValue;
@@ -441,7 +441,7 @@ public:
             sumf += volume*sourceVec[0];
 
             // get the absolute permeability
-            Dune::FieldMatrix<double,dim,dim> K = problem.spatialParameters().intrinsicPermeability(element);
+            Dune::FieldMatrix<double,dim,dim> K = problem.spatialParams().intrinsicPermeability(element);
 
             int isIdx = -1;
             Dune::FieldVector<Scalar,2*dim> fluxVector;
@@ -618,7 +618,7 @@ public:
             sumf += volume*problem.source(global, element, local)[0];
 
             // get the absolute permeability
-            Dune::FieldMatrix<Scalar,dim,dim> K = problem.spatialParameters().K(global, element, local);
+            Dune::FieldMatrix<Scalar,dim,dim> K = problem.spatialParams().K(global, element, local);
 
             int i = -1;
             Dune::FieldVector<Scalar,dim> exactGradient;
diff --git a/test/decoupled/1p/test_1pproblem.hh b/test/decoupled/1p/test_1pproblem.hh
index cbb3ce9d1cada19e693081b1c2736bfec083cd00..aed5f386e811b8f75a9e746d2c047e2a6609c7b4 100644
--- a/test/decoupled/1p/test_1pproblem.hh
+++ b/test/decoupled/1p/test_1pproblem.hh
@@ -77,7 +77,7 @@ public:
 };
 
 // Set the spatial parameters
-SET_TYPE_PROP(TestProblemOneP, SpatialParameters, Dumux::TestOnePSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestProblemOneP, SpatialParams, Dumux::TestOnePSpatialParams<TypeTag>);
 
 // Enable gravity
 SET_BOOL_PROP(TestProblemOneP, EnableGravity, false);
@@ -145,7 +145,7 @@ public:
             exit(1);
         }
 
-        this->spatialParameters().setDelta(delta_);
+        this->spatialParams().setDelta(delta_);
     }
 
     /*!
diff --git a/test/decoupled/1p/test_diffusionproblem.hh b/test/decoupled/1p/test_diffusionproblem.hh
index d76e087e505f3a8db9b48d74f9f081d55cb7ffee..263478c2704cc1cb35906bfb5f6d4adf5c39f7ef 100644
--- a/test/decoupled/1p/test_diffusionproblem.hh
+++ b/test/decoupled/1p/test_diffusionproblem.hh
@@ -220,7 +220,7 @@ public:
     void init()
     {
         this->variables().initialize();
-        this->spatialParameters().initialize(delta_);
+        this->spatialParams().initialize(delta_);
         for (int i = 0; i < this->gridView().size(0); i++)
         {
             this->variables().cellData(i).setSaturation(wPhaseIdx, 1.0);
@@ -257,7 +257,7 @@ public:
 
         this->resultWriter().attachCellData(*exactPressure, "exact pressure");
 
-        this->spatialParameters().addOutputVtkFields(this->resultWriter());
+        this->spatialParams().addOutputVtkFields(this->resultWriter());
 
         return;
     }
diff --git a/test/decoupled/1p/test_diffusionspatialparams.hh b/test/decoupled/1p/test_diffusionspatialparams.hh
index 945bfbc101f9d8dc41c6c0061027849bd87b80f3..3ff1dcf5749e05beed6407a7023f817cff1b2876 100644
--- a/test/decoupled/1p/test_diffusionspatialparams.hh
+++ b/test/decoupled/1p/test_diffusionspatialparams.hh
@@ -44,7 +44,7 @@ namespace Properties
 NEW_TYPE_TAG(TestDiffusionSpatialParams);
 
 // Set the spatial parameters
-SET_TYPE_PROP(TestDiffusionSpatialParams, SpatialParameters, Dumux::TestDiffusionSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestDiffusionSpatialParams, SpatialParams, Dumux::TestDiffusionSpatialParams<TypeTag>);
 
 // Set the material law
 SET_PROP(TestDiffusionSpatialParams, MaterialLaw)
diff --git a/test/decoupled/2p/test_impesspatialparams.hh b/test/decoupled/2p/test_impesspatialparams.hh
index aaff506a1ecd0c614783845df15e35aaa4227dbd..7ca9d3c2094359e632c0ef39b9f02d3d9ae78660 100644
--- a/test/decoupled/2p/test_impesspatialparams.hh
+++ b/test/decoupled/2p/test_impesspatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
 NEW_TYPE_TAG(TestIMPESSpatialParams);
 
 // Set the spatial parameters
-SET_TYPE_PROP(TestIMPESSpatialParams, SpatialParameters, Dumux::TestIMPESSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestIMPESSpatialParams, SpatialParams, Dumux::TestIMPESSpatialParams<TypeTag>);
 
 // Set the material law
 SET_PROP(TestIMPESSpatialParams, MaterialLaw)
diff --git a/test/decoupled/2p/test_transportspatialparams.hh b/test/decoupled/2p/test_transportspatialparams.hh
index 5494438ed383ee09c4b7aab06da793b9dd08e0d3..779aaf3e9f5e27c273590fc1a1ebd57afeeaa2ac 100644
--- a/test/decoupled/2p/test_transportspatialparams.hh
+++ b/test/decoupled/2p/test_transportspatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
 NEW_TYPE_TAG(TestTransportSpatialParams);
 
 // Set the spatial parameters
-SET_TYPE_PROP(TestTransportSpatialParams, SpatialParameters, Dumux::TestTransportSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestTransportSpatialParams, SpatialParams, Dumux::TestTransportSpatialParams<TypeTag>);
 
 // Set the material law
 SET_PROP(TestTransportSpatialParams, MaterialLaw)
diff --git a/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh b/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
index 9c26fedf913ce9c35957f9f344cda434380e3347..4f5d997ff60a8ea73ccd8f383bfa525d437dd6f8 100644
--- a/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
+++ b/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
 NEW_TYPE_TAG(TestIMPESAdaptiveSpatialParams);
 
 // Set the spatial parameters
-SET_TYPE_PROP(TestIMPESAdaptiveSpatialParams, SpatialParameters, Dumux::TestIMPESAdaptiveSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestIMPESAdaptiveSpatialParams, SpatialParams, Dumux::TestIMPESAdaptiveSpatialParams<TypeTag>);
 
 // Set the material law
 SET_PROP(TestIMPESAdaptiveSpatialParams, MaterialLaw)