diff --git a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
index 0cb1c599565e4cdac0a16ef86ce7f83dcd135d3f..87ad388043378565d1712e804ef185173ab43296 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
@@ -88,7 +88,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
index 11694890da164c32ec0c7348634ebce0a268d676..4dc891770dedb53952a748b84113cbad2e9e3e69 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
@@ -84,7 +84,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
index 9f243fb5615360d1ef0b2665d3d83872d4c07f2e..eefa797640095646c20eb35900c7d173e01bb4e8 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
@@ -94,7 +94,7 @@ public:
 
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
index da2742e91c2d1d50ea55bbe8c7250ecfa8b37108..4c67c969dfac4e4ba4010eca95b999831a8c011a 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
@@ -83,7 +83,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
index f2c62155a771ad1a687efa24b572009c9cd775cb..c2435326d75ab2d064abfbe291f95e9ce5c8c6a7 100644
--- a/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
@@ -83,7 +83,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
index 9b52441ba2e7a57bf8241f03ab76a680c8f41263..d758aef5ec9d66d99fd3c355a99a0cbb0e3597d7 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
@@ -107,7 +107,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
index 77a915c5611285ef3fbe2e0a20998aa18cb5ae1f..b16a128274b2c529ebfd689b9466de40102ff898 100644
--- a/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
@@ -83,7 +83,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
index 73efbc3e0ab95b66b604a331a396fbd608432c2c..4a917e81a80147be9dd33297bd277e70ebd1a1cd 100644
--- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
@@ -102,7 +102,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
     {
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh
index 138079d15f3b9b4afb3569f4b53255311c9d400d..0ee720606fe174b35e496c8ee227bd2bded3bb26 100644
--- a/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh
@@ -127,7 +127,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos The global coordinates for the given location
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
index 1843367baf6e92e14ed46e61842d53bc8403219c..cbbc484c06c289780f62b9aaa0b94e4c1a923621 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
@@ -80,7 +80,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh b/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh
index 71cf16416cb8cc3196ed05ca802a82bd9df64d62..e291b2a8fb2446dad257d879ac2d81db92d72eb7 100644
--- a/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh
@@ -85,7 +85,7 @@ public:
     { return 0.2; }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
index 6efbf239cb2e32939981a7a067177a27e9155bcf..6292e4659fe021bf1ac8e5b94efad20e10986e7d 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
@@ -84,7 +84,7 @@ public:
     { return 0.2; }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh
index c0a59da7daa0a2fd8e7a9b9abbdfb63c2d4d5ef9..38ff73993981b55256115ac62bacfffbb15ee486 100644
--- a/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh
+++ b/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh
@@ -129,7 +129,7 @@ public:
     { return 10.0; }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh
index e3985f9e08501e29ca3e5278a882aa98065694e3..b0f95c14862b4356c4511a2bb57ec1848bb5c981 100644
--- a/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh
+++ b/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh
@@ -130,7 +130,7 @@ public:
     { return 10.0; }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
diff --git a/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh
index 42c0ccf0da2272840eb3b126b66fc0214acb8db1..bc0b79e05a9f1a3dd1e39af2ecd619b0ce18bbc2 100644
--- a/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh
@@ -143,7 +143,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/co2/implicit/spatialparams.hh b/test/porousmediumflow/co2/implicit/spatialparams.hh
index 43d2c5016a23a257ad71c54b40b55a0c65494f82..8cfeada7b74d7e503c9ab8fe6fac220dbe03b6ce 100644
--- a/test/porousmediumflow/co2/implicit/spatialparams.hh
+++ b/test/porousmediumflow/co2/implicit/spatialparams.hh
@@ -167,7 +167,7 @@ public:
 
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
index c1c2d0f1fcbcb2774fcf3f8622f2a8efe8ba4c0a..ca8ba66062229e4eb99596cb27a5957d1706b69e 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
@@ -196,7 +196,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     const NonwettingSolidInterfacialArea& nonwettingSolidInterfacialAreaAtPos(const GlobalPosition &globalPos) const
@@ -209,7 +209,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     const WettingSolidInterfacialArea& wettingSolidInterfacialAreaAtPos(const GlobalPosition &globalPos) const
@@ -218,7 +218,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     const WettingNonwettingInterfacialArea& wettingNonwettingInterfacialAreaAtPos(const GlobalPosition &globalPos) const
@@ -232,7 +232,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      */
     template<class ElementSolution>
     auto fluidMatrixInteraction(const Element& element,
@@ -243,7 +243,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
     {
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh
index a7843b25266fe4d82952e98c6b82cc572297f1f9..5b60e7488a70c4c66a292578d81aa3df8a947ef3 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh
@@ -89,7 +89,7 @@ public:
     { return porosity_; }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
     {
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
index bcef6650c9b90d8578c055e930283ce4ece6080f..f273a4e84fa35c445bed63342c03e2b034358822 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
@@ -189,7 +189,7 @@ public:
     Scalar interfacialTension() const { return interfacialTension_ ; }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
diff --git a/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh b/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh
index 6a450aa0e8f36edf3a169881c9f0537115e3b9dd..62c184ac94141e3bea8bfa11004b141450c59055 100644
--- a/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh
@@ -82,7 +82,7 @@ public:
     { return 0.4; }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos A global coordinate vector
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
diff --git a/test/porousmediumflow/richards/implicit/lens/spatialparams.hh b/test/porousmediumflow/richards/implicit/lens/spatialparams.hh
index 100ecb90da7aacc9e53d3a7e7919a3d1e1c34e25..34468ca84dd187bf23d3ba7610415cc0f8a5a8dc 100644
--- a/test/porousmediumflow/richards/implicit/lens/spatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/lens/spatialparams.hh
@@ -102,7 +102,7 @@ public:
     { return 0.4; }
 
     /*!
-     * \brief Returns the parameters for the material law for the sub-control volume
+     * \brief Returns the fluid-matrix interaction law for the sub-control volume
      *
      * This method is not actually required by the Richards model, but provided
      * for the convenience of the RichardsLensProblem
@@ -122,7 +122,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * This method is not actually required by the Richards model, but provided
      * for the convenience of the RichardsLensProblem
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh
index 7afce1ac6a23a19ff2da436a3195a1fd99f842b5..31ff4d037735b98d519a4c019dc13debd86c09bc 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh
@@ -82,7 +82,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      * \param globalPos The global coordinates for the given location
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/test/porousmediumflow/richardsnc/implicit/spatialparams.hh b/test/porousmediumflow/richardsnc/implicit/spatialparams.hh
index 4e4434dd953c86b5a17fd2ceaaefad1af9ba8e69..5d755c32011de2e9ab466d58b0c22dc44ffc9fd1 100644
--- a/test/porousmediumflow/richardsnc/implicit/spatialparams.hh
+++ b/test/porousmediumflow/richardsnc/implicit/spatialparams.hh
@@ -93,7 +93,7 @@ public:
     }
 
     /*!
-     * \brief Returns the parameters for the material law at a given location
+     * \brief Returns the fluid-matrix interaction law at a given location
      *
      * \param globalPos The global coordinates for the given location
      */