diff --git a/dumux/implicit/1p/1ppropertydefaults.hh b/dumux/implicit/1p/1ppropertydefaults.hh
index fb927d1de57289fd28971250731a22c7faf9feba..d09f679ccab111099cc918bad664edfa19b07ea9 100644
--- a/dumux/implicit/1p/1ppropertydefaults.hh
+++ b/dumux/implicit/1p/1ppropertydefaults.hh
@@ -51,23 +51,23 @@ namespace Dumux
 // default property values for the isothermal single phase model
 ///////////////////////////////////////////////////////////////////////////
 namespace Properties {
-SET_INT_PROP(OneP, NumEq, GET_PROP_VALUE(TypeTag, IsothermalNumEq)); //!< set the number of equations to 1
+SET_INT_PROP(OneP, NumEq, 1); //!< set the number of equations to 1
 SET_INT_PROP(OneP, NumPhases, 1); //!< The number of phases in the 1p model is 1
 
 //! The local residual function
-SET_TYPE_PROP(OneP, LocalResidual, typename GET_PROP_TYPE(TypeTag, IsothermalLocalResidual));
+SET_TYPE_PROP(OneP, LocalResidual, OnePLocalResidual<TypeTag>);
 
 //! the Model property
-SET_TYPE_PROP(OneP, Model, typename GET_PROP_TYPE(TypeTag, IsothermalModel));
+SET_TYPE_PROP(OneP, Model, OnePModel<TypeTag>);
 
 //! the VolumeVariables property
-SET_TYPE_PROP(OneP, VolumeVariables, typename GET_PROP_TYPE(TypeTag, IsothermalVolumeVariables));
+SET_TYPE_PROP(OneP, VolumeVariables, OnePVolumeVariables<TypeTag>);
 
 //! the FluxVariables property
-SET_TYPE_PROP(OneP, FluxVariables, typename GET_PROP_TYPE(TypeTag, IsothermalFluxVariables));
+SET_TYPE_PROP(OneP, FluxVariables, ImplicitDarcyFluxVariables<TypeTag>);
 
 //! The indices required by the isothermal single-phase model
-SET_TYPE_PROP(OneP, Indices, typename GET_PROP_TYPE(TypeTag, IsothermalIndices));
+SET_TYPE_PROP(OneP, Indices, OnePIndices);
 
 //! The spatial parameters to be employed.
 //! Use ImplicitSpatialParamsOneP by default.
@@ -116,10 +116,10 @@ SET_BOOL_PROP(OneP, ProblemEnableGravity, true);
 //        Actually the Forchheimer coefficient is also a function of the dimensions of the
 //        porous medium. Taking it as a constant is only a first approximation
 //        (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(BoxModel, SpatialParamsForchCoeff, 0.55);
+SET_SCALAR_PROP(OneP, SpatialParamsForchCoeff, 0.55);
 
 //! average is used as default model to compute the effective thermal heat conductivity
-SET_PROP(NonIsothermal, ThermalConductivityModel)
+SET_PROP(OnePNI, ThermalConductivityModel)
 { private :
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
   public:
@@ -131,22 +131,22 @@ SET_PROP(NonIsothermal, ThermalConductivityModel)
 //////////////////////////////////////////////////////////////////
 
 // set isothermal Model
-SET_TYPE_PROP(OneP, IsothermalModel, OnePModel<TypeTag>);
+SET_TYPE_PROP(OnePNI, IsothermalModel, OnePModel<TypeTag>);
 
 //set isothermal FluxVariables
-SET_TYPE_PROP(OneP, IsothermalFluxVariables, ImplicitDarcyFluxVariables<TypeTag>);
+SET_TYPE_PROP(OnePNI, IsothermalFluxVariables, ImplicitDarcyFluxVariables<TypeTag>);
 
 //set isothermal VolumeVariables
-SET_TYPE_PROP(OneP, IsothermalVolumeVariables, OnePVolumeVariables<TypeTag>);
+SET_TYPE_PROP(OnePNI, IsothermalVolumeVariables, OnePVolumeVariables<TypeTag>);
 
 //set isothermal LocalResidual
-SET_TYPE_PROP(OneP, IsothermalLocalResidual, OnePLocalResidual<TypeTag>);
+SET_TYPE_PROP(OnePNI, IsothermalLocalResidual, OnePLocalResidual<TypeTag>);
 
 //set isothermal Indices
-SET_TYPE_PROP(OneP, IsothermalIndices, OnePIndices);
+SET_TYPE_PROP(OnePNI, IsothermalIndices, OnePIndices);
 
 //set isothermal NumEq
-SET_INT_PROP(OneP, IsothermalNumEq, 1);
+SET_INT_PROP(OnePNI, IsothermalNumEq, 1);
 
 // \}
 } // end namespace Properties
diff --git a/dumux/implicit/1p2c/1p2cpropertydefaults.hh b/dumux/implicit/1p2c/1p2cpropertydefaults.hh
index d57c8ce66a896c4faf4c80c91256360d7800c21a..38bf6fa731890925bbf380ff1a8e85908134eec6 100644
--- a/dumux/implicit/1p2c/1p2cpropertydefaults.hh
+++ b/dumux/implicit/1p2c/1p2cpropertydefaults.hh
@@ -51,23 +51,23 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 
 
-SET_INT_PROP(OnePTwoC, NumEq, GET_PROP_VALUE(TypeTag, IsothermalNumEq)); //!< set the number of equations to 2
+SET_INT_PROP(OnePTwoC, NumEq, 2); //!< set the number of equations to 2
 SET_INT_PROP(OnePTwoC, NumPhases, 1); //!< The number of phases in the 1p2c model is 1
 SET_INT_PROP(OnePTwoC, NumComponents, 2); //!< The number of components in the 1p2c model is 2
 SET_SCALAR_PROP(OnePTwoC, Scaling, 1); //!< Scaling of the model is set to 1 by default
 SET_BOOL_PROP(OnePTwoC, UseMoles, true); //!< Define that mole fractions are used in the balance equations
 
 //! Use the 1p2c local residual function for the 1p2c model
-SET_TYPE_PROP(OnePTwoC, LocalResidual, typename GET_PROP_TYPE(TypeTag, IsothermalLocalResidual));
+SET_TYPE_PROP(OnePTwoC, LocalResidual, OnePTwoCLocalResidual<TypeTag>);
 
 //! define the model
-SET_TYPE_PROP(OnePTwoC, Model, typename GET_PROP_TYPE(TypeTag, IsothermalModel));
+SET_TYPE_PROP(OnePTwoC, Model, OnePTwoCModel<TypeTag>);
 
 //! define the VolumeVariables
-SET_TYPE_PROP(OnePTwoC, VolumeVariables, typename GET_PROP_TYPE(TypeTag, IsothermalVolumeVariables));
+SET_TYPE_PROP(OnePTwoC, VolumeVariables, OnePTwoCVolumeVariables<TypeTag>);
 
 //! define the FluxVariables
-SET_TYPE_PROP(OnePTwoC, FluxVariables, typename GET_PROP_TYPE(TypeTag, IsothermalFluxVariables));
+SET_TYPE_PROP(OnePTwoC, FluxVariables, OnePTwoCFluxVariables<TypeTag>);
 
 /*!
  * \brief The fluid state which is used by the volume variables to
@@ -90,7 +90,7 @@ SET_SCALAR_PROP(OnePTwoC, ImplicitMassUpwindWeight, 1.0);
 SET_SCALAR_PROP(OnePTwoC, ImplicitMobilityUpwindWeight, 1.0);
 
 //! Set the indices used by the 1p2c model
-SET_TYPE_PROP(OnePTwoC, Indices, typename GET_PROP_TYPE(TypeTag, IsothermalIndices));
+SET_TYPE_PROP(OnePTwoC, Indices, OnePTwoCIndices<TypeTag>);
 //! The spatial parameters to be employed.
 //! Use ImplicitSpatialParamsOneP by default.
 SET_TYPE_PROP(OnePTwoC, SpatialParams, ImplicitSpatialParamsOneP<TypeTag>);
@@ -117,10 +117,10 @@ SET_BOOL_PROP(OnePTwoC, ProblemEnableGravity, true);
 //        Actually the Forchheimer coefficient is also a function of the dimensions of the
 //        porous medium. Taking it as a constant is only a first approximation
 //        (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(BoxModel, SpatialParamsForchCoeff, 0.55);
+SET_SCALAR_PROP(OnePTwoC, SpatialParamsForchCoeff, 0.55);
 
 //! average is used as default model to compute the effective thermal heat conductivity
-SET_PROP(NonIsothermal, ThermalConductivityModel)
+SET_PROP(OnePTwoCNI, ThermalConductivityModel)
 { private :
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
   public:
@@ -132,22 +132,22 @@ SET_PROP(NonIsothermal, ThermalConductivityModel)
 //////////////////////////////////////////////////////////////////
 
 // set isothermal Model
-SET_TYPE_PROP(OnePTwoC, IsothermalModel, OnePTwoCModel<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNI, IsothermalModel, OnePTwoCModel<TypeTag>);
 
 // set isothermal FluxVariables
-SET_TYPE_PROP(OnePTwoC, IsothermalFluxVariables, OnePTwoCFluxVariables<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNI, IsothermalFluxVariables, OnePTwoCFluxVariables<TypeTag>);
 
 //set isothermal VolumeVariables
-SET_TYPE_PROP(OnePTwoC, IsothermalVolumeVariables, OnePTwoCVolumeVariables<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNI, IsothermalVolumeVariables, OnePTwoCVolumeVariables<TypeTag>);
 
 //set isothermal LocalResidual
-SET_TYPE_PROP(OnePTwoC, IsothermalLocalResidual, OnePTwoCLocalResidual<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNI, IsothermalLocalResidual, OnePTwoCLocalResidual<TypeTag>);
 
 //set isothermal Indices
-SET_TYPE_PROP(OnePTwoC, IsothermalIndices, OnePTwoCIndices<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNI, IsothermalIndices, OnePTwoCIndices<TypeTag>);
 
 //set isothermal NumEq
-SET_INT_PROP(OnePTwoC, IsothermalNumEq, 2);
+SET_INT_PROP(OnePTwoCNI, IsothermalNumEq, 2);
 
 
 }
diff --git a/dumux/implicit/2p/2ppropertydefaults.hh b/dumux/implicit/2p/2ppropertydefaults.hh
index 4a37caff8bc7f2b7c49e1882efc59c65a42c8e5f..0db57d26416fe121f8d2c0a67b12ec989be0b9b6 100644
--- a/dumux/implicit/2p/2ppropertydefaults.hh
+++ b/dumux/implicit/2p/2ppropertydefaults.hh
@@ -145,10 +145,10 @@ SET_BOOL_PROP(TwoP, ProblemEnableGravity, true);
 //        Actually the Forchheimer coefficient is also a function of the dimensions of the
 //        porous medium. Taking it as a constant is only a first approximation
 //        (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(BoxModel, SpatialParamsForchCoeff, 0.55);
+SET_SCALAR_PROP(TwoP, SpatialParamsForchCoeff, 0.55);
 
 //! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(NonIsothermal, ThermalConductivityModel)
+SET_PROP(TwoPNI, ThermalConductivityModel)
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/implicit/2p2c/2p2cpropertydefaults.hh b/dumux/implicit/2p2c/2p2cpropertydefaults.hh
index d4252a2bff5270335689e86fc741383021da122b..c042e42fe5d1c6fb7913a175645121bea70bbad6 100644
--- a/dumux/implicit/2p2c/2p2cpropertydefaults.hh
+++ b/dumux/implicit/2p2c/2p2cpropertydefaults.hh
@@ -182,10 +182,10 @@ SET_BOOL_PROP(TwoPTwoC, UseConstraintSolver, true);
 //        Actually the Forchheimer coefficient is also a function of the dimensions of the
 //        porous medium. Taking it as a constant is only a first approximation
 //        (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(BoxModel, SpatialParamsForchCoeff, 0.55);
+SET_SCALAR_PROP(TwoPTwoC, SpatialParamsForchCoeff, 0.55);
 
 //! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(NonIsothermal, ThermalConductivityModel)
+SET_PROP(TwoPTwoCNI, ThermalConductivityModel)
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/implicit/2pminc/2pmincproperties.hh b/dumux/implicit/2pminc/2pmincproperties.hh
index 00b3a2c9ed26d48c7cc27bd5379feab4d389edb1..9e231fb9f4fcb55f38004cedfb5c870d0bf73958 100644
--- a/dumux/implicit/2pminc/2pmincproperties.hh
+++ b/dumux/implicit/2pminc/2pmincproperties.hh
@@ -36,7 +36,8 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 
 //! The type tag for the two-phase minc model with BOX discretization
-NEW_TYPE_TAG(BoxTwoPMinc, INHERITS_FROM(BoxTwoP));
+NEW_TYPE_TAG(TwoPMinc);
+NEW_TYPE_TAG(BoxTwoPMinc, INHERITS_FROM(BoxTwoP, TwoPMinc));
 
 //////////////////////////////////////////////////////////////////
 // Property tags
diff --git a/dumux/implicit/2pminc/2pmincpropertydefaults.hh b/dumux/implicit/2pminc/2pmincpropertydefaults.hh
index 9e3c0beae063be60c3a71e1df3212e6a21001366..8d186b51a65f68766588b3ce792b2948dbaabd72 100644
--- a/dumux/implicit/2pminc/2pmincpropertydefaults.hh
+++ b/dumux/implicit/2pminc/2pmincpropertydefaults.hh
@@ -44,29 +44,29 @@ namespace Properties
 // Property values
 //////////////////////////////////////////////////////////////////
 //! Use the 2pminc local jacobian operator for the 2pminc model
-SET_TYPE_PROP(BoxTwoPMinc,
+SET_TYPE_PROP(TwoPMinc,
               LocalResidual,
               TwoPMincLocalResidual<TypeTag>);
 
 //! the Model property
-SET_TYPE_PROP(BoxTwoPMinc, Model, TwoPMincModel<TypeTag>);
+SET_TYPE_PROP(TwoPMinc, Model, TwoPMincModel<TypeTag>);
 
 //! the VolumeVariables property
-SET_TYPE_PROP(BoxTwoPMinc, VolumeVariables, TwoPMincVolumeVariables<TypeTag>);
+SET_TYPE_PROP(TwoPMinc, VolumeVariables, TwoPMincVolumeVariables<TypeTag>);
 //! the FluxVariables property
-SET_TYPE_PROP(BoxTwoPMinc, FluxVariables, TwoPMincFluxVariables<TypeTag>);
+SET_TYPE_PROP(TwoPMinc, FluxVariables, TwoPMincFluxVariables<TypeTag>);
 
 //! The Indices property
-SET_TYPE_PROP(BoxTwoPMinc,
+SET_TYPE_PROP(TwoPMinc,
               Indices,
               TwoPMincIndices<TypeTag, GET_PROP_VALUE(TypeTag, Formulation), 0>);
 
 
 //! Set the number of continua to 2
-SET_INT_PROP(BoxTwoPMinc, NumContinua, 2);
+SET_INT_PROP(TwoPMinc, NumContinua, 2);
 
 //! Set the default inteaction type to constant volume fractions
-SET_INT_PROP(BoxTwoPMinc, ProblemInteractingContinuaType, 0);
+SET_INT_PROP(TwoPMinc, ProblemInteractingContinuaType, 0);
 }
 }
 #endif
diff --git a/dumux/implicit/2pnc/2pncpropertydefaults.hh b/dumux/implicit/2pnc/2pncpropertydefaults.hh
index 7a8f14ed9d928bba7688ee7af09da9e4810ae314..39fcd2570a3b8d87a8f29ee525b7ab7d7f163b81 100644
--- a/dumux/implicit/2pnc/2pncpropertydefaults.hh
+++ b/dumux/implicit/2pnc/2pncpropertydefaults.hh
@@ -177,7 +177,7 @@ SET_BOOL_PROP(TwoPNC, ProblemEnableGravity, true);
 SET_BOOL_PROP(TwoPNC, VtkAddVelocity, false);
 
 //! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(NonIsothermal, ThermalConductivityModel)
+SET_PROP(TwoPNCNI, ThermalConductivityModel)
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/implicit/2pncmin/2pncminpropertydefaults.hh b/dumux/implicit/2pncmin/2pncminpropertydefaults.hh
index c52eb5097da2be0c7013993d7da940e01c11420a..f29e361e3180b0665b694f8f1e24643bc34050fc 100644
--- a/dumux/implicit/2pncmin/2pncminpropertydefaults.hh
+++ b/dumux/implicit/2pncmin/2pncminpropertydefaults.hh
@@ -134,7 +134,7 @@ SET_BOOL_PROP(TwoPNCMin, useSalinity, false);
 //        Actually the Forchheimer coefficient is also a function of the dimensions of the
 //        porous medium. Taking it as a constant is only a first approximation
 //        (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(BoxModel, SpatialParamsForchCoeff, 0.55);
+SET_SCALAR_PROP(TwoPNCMin, SpatialParamsForchCoeff, 0.55);
 
 }
 
diff --git a/dumux/implicit/3p/3ppropertydefaults.hh b/dumux/implicit/3p/3ppropertydefaults.hh
index 23fe9b69719a1d14e46e50dbedc26e35fb770062..7431c884aa8707ba997ddd7ea76bb466f350f90f 100644
--- a/dumux/implicit/3p/3ppropertydefaults.hh
+++ b/dumux/implicit/3p/3ppropertydefaults.hh
@@ -118,7 +118,7 @@ SET_BOOL_PROP(ThreeP, VtkAddVelocity, false);
 SET_BOOL_PROP(ThreeP, ProblemEnableGravity, true);
 
 //! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(NonIsothermal, ThermalConductivityModel)
+SET_PROP(ThreePNI, ThermalConductivityModel)
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/implicit/3p3c/3p3cpropertydefaults.hh b/dumux/implicit/3p3c/3p3cpropertydefaults.hh
index 81b3af95202eb29da5a4b26dc21f473068841003..59fc363d037f186cb73c2b56c06b1a6ee35377b1 100644
--- a/dumux/implicit/3p3c/3p3cpropertydefaults.hh
+++ b/dumux/implicit/3p3c/3p3cpropertydefaults.hh
@@ -165,7 +165,7 @@ SET_BOOL_PROP(ThreePThreeC, ProblemEnableGravity, true);
 SET_SCALAR_PROP(BoxModel, SpatialParamsForchCoeff, 0.55);
 
 //! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(NonIsothermal, ThermalConductivityModel)
+SET_PROP(ThreePThreeCNI, ThermalConductivityModel)
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/implicit/mpnc/mpncpropertydefaults.hh b/dumux/implicit/mpnc/mpncpropertydefaults.hh
index 7235103fe5513c7f91a4e2eefa80f7208a590004..a189e9ccb6b41ff6468a11bd624f55edcc41396e 100644
--- a/dumux/implicit/mpnc/mpncpropertydefaults.hh
+++ b/dumux/implicit/mpnc/mpncpropertydefaults.hh
@@ -238,7 +238,7 @@ SET_INT_PROP(MPNC,
 //        Actually the Forchheimer coefficient is also a function of the dimensions of the
 //        porous medium. Taking it as a constant is only a first approximation
 //        (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(BoxModel, SpatialParamsForchCoeff, 0.55);
+SET_SCALAR_PROP(MPNC, SpatialParamsForchCoeff, 0.55);
 
 
 //!< Should the averaging of velocities be done in the Model? (By default in the output)
diff --git a/dumux/implicit/richards/richardspropertydefaults.hh b/dumux/implicit/richards/richardspropertydefaults.hh
index 4aa82b1e1d61ae560959754977df9863ec7e5048..34e5828bbd62e577a5b3c679f09a6ccf1f8310d5 100644
--- a/dumux/implicit/richards/richardspropertydefaults.hh
+++ b/dumux/implicit/richards/richardspropertydefaults.hh
@@ -53,7 +53,7 @@ namespace Properties {
 // Properties values
 //////////////////////////////////////////////////////////////////
 //! Number of equations required by the model
-SET_INT_PROP(Richards, NumEq, GET_PROP_VALUE(TypeTag, IsothermalNumEq));
+SET_INT_PROP(Richards, NumEq, 1);
 //! Number of fluid phases considered
 SET_INT_PROP(Richards, NumPhases, 2);
 
@@ -61,18 +61,16 @@ SET_INT_PROP(Richards, NumPhases, 2);
 SET_BOOL_PROP(Richards, UseHead, false);
 
 //! The local residual operator
-SET_TYPE_PROP(Richards,
-              LocalResidual,
-              typename GET_PROP_TYPE(TypeTag, IsothermalLocalResidual));
+SET_TYPE_PROP(Richards, LocalResidual, RichardsLocalResidual<TypeTag>);
 
 //! The global model used
-SET_TYPE_PROP(Richards, Model, typename GET_PROP_TYPE(TypeTag, IsothermalModel));
+SET_TYPE_PROP(Richards, Model, RichardsModel<TypeTag>);
 
 //! The class for the volume averaged quantities
-SET_TYPE_PROP(Richards, VolumeVariables, typename GET_PROP_TYPE(TypeTag, IsothermalVolumeVariables));
+SET_TYPE_PROP(Richards, VolumeVariables, RichardsVolumeVariables<TypeTag>);
 
 //! The class for the quantities required for the flux calculation
-SET_TYPE_PROP(Richards, FluxVariables, typename GET_PROP_TYPE(TypeTag, IsothermalFluxVariables));
+SET_TYPE_PROP(Richards, FluxVariables, RichardsFluxVariables<TypeTag>);
 
 //! The class of the newton controller
 SET_TYPE_PROP(Richards, NewtonController, RichardsNewtonController<TypeTag>);
@@ -84,7 +82,7 @@ SET_SCALAR_PROP(Richards, ImplicitMassUpwindWeight, 1.0);
 SET_SCALAR_PROP(Richards, ImplicitMobilityUpwindWeight, 1.0);
 
 //! The class with all index definitions for the model
-SET_TYPE_PROP(Richards, Indices, typename GET_PROP_TYPE(TypeTag, IsothermalIndices));
+SET_TYPE_PROP(Richards, Indices, RichardsIndices<TypeTag>);
 
 //! The spatial parameters to be employed.
 //! Use ImplicitSpatialParams by default.
@@ -182,10 +180,10 @@ SET_BOOL_PROP(Richards, ProblemEnableGravity, true);
 //        Actually the Forchheimer coefficient is also a function of the dimensions of the
 //        porous medium. Taking it as a constant is only a first approximation
 //        (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(BoxModel, SpatialParamsForchCoeff, 0.55);
+SET_SCALAR_PROP(Richards, SpatialParamsForchCoeff, 0.55);
 
 //! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(NonIsothermal, ThermalConductivityModel)
+SET_PROP(RichardsNI, ThermalConductivityModel)
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -202,22 +200,22 @@ SET_BOOL_PROP(RichardsNI, NiOutputLevel, 0);
 //////////////////////////////////////////////////////////////////
 
 // set isothermal Model
-SET_TYPE_PROP(Richards, IsothermalModel, RichardsModel<TypeTag>);
+SET_TYPE_PROP(RichardsNI, IsothermalModel, RichardsModel<TypeTag>);
 
 // set isothermal FluxVariables
-SET_TYPE_PROP(Richards, IsothermalFluxVariables, RichardsFluxVariables<TypeTag>);
+SET_TYPE_PROP(RichardsNI, IsothermalFluxVariables, RichardsFluxVariables<TypeTag>);
 
 //set isothermal VolumeVariables
-SET_TYPE_PROP(Richards, IsothermalVolumeVariables, RichardsVolumeVariables<TypeTag>);
+SET_TYPE_PROP(RichardsNI, IsothermalVolumeVariables, RichardsVolumeVariables<TypeTag>);
 
 //set isothermal LocalResidual
-SET_TYPE_PROP(Richards, IsothermalLocalResidual, RichardsLocalResidual<TypeTag>);
+SET_TYPE_PROP(RichardsNI, IsothermalLocalResidual, RichardsLocalResidual<TypeTag>);
 
 //set isothermal Indices
-SET_TYPE_PROP(Richards, IsothermalIndices, RichardsIndices<TypeTag>);
+SET_TYPE_PROP(RichardsNI, IsothermalIndices, RichardsIndices<TypeTag>);
 
 //set isothermal NumEq
-SET_INT_PROP(Richards, IsothermalNumEq, 1);
+SET_INT_PROP(RichardsNI, IsothermalNumEq, 1);
 
 // \}
 }