diff --git a/doc/doxygen/modules b/doc/doxygen/modules
index 97faf33be3baf1a0b158e90c7c18d9f2f0ac2474..1b931656fa3068ecfa0634e837c0846d3c059ebe 100644
--- a/doc/doxygen/modules
+++ b/doc/doxygen/modules
@@ -155,7 +155,7 @@
          */
         /*!
          * \ingroup ImplicitModels
-         * \defgroup TwoPDFMBoxModel Two-phase flow in discrete fracture-matrix
+         * \defgroup TwoPDFMModel Two-phase flow in discrete fracture-matrix
          *
          * \copydetails Dumux::TwoPDFMModel
          */
@@ -201,6 +201,18 @@
          *
          * \copydetails Dumux::Stokes2cniModel
          */
+         /*!
+         * \ingroup ImplicitModels
+         * \defgroup BoxStokesncModel N-component Stokes
+         *
+         * \copydetails Dumux::StokesncModel
+         */
+        /*!
+         * \ingroup ImplicitModels
+         * \defgroup BoxStokesncniModel Non-isothermal N-component Stokes
+         *
+         * \copydetails Dumux::StokesncniModel
+         */
         /*!
          * \ingroup ImplicitModels
          * \defgroup ElasticBoxModel Linear elastic 
diff --git a/dumux/implicit/2pdfm/2pdfmfluxvariables.hh b/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
index 6f167ede6a32abe4be5c3b22508c1947d8f604d6..2917668d149411054ced33f190605bd131555de4 100644
--- a/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
@@ -20,8 +20,8 @@
  *        all fluxes of fluid phases over a face of a finite volume in the
  *        two phase discrete fracture-matrix model.
  */
-#ifndef DUMUX_BOXMODELS_2PDFM_FLUX_VARIABLES_HH
-#define DUMUX_BOXMODELS_2PDFM_FLUX_VARIABLES_HH
+#ifndef DUMUX_MODELS_2PDFM_FLUX_VARIABLES_HH
+#define DUMUX_MODELS_2PDFM_FLUX_VARIABLES_HH
 
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
@@ -34,7 +34,7 @@ namespace Dumux
 {
 
 /*!
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  * \ingroup ImplicitFluxVariables
  * \brief Contains the data which is required to calculate the fluxes of 
  *        the fluid phases over a face of a finite volume for the two-phase
@@ -226,4 +226,4 @@ private:
 
 } // end namespace
 
-#endif // DUMUX_BOXMODELS_2PDFM_FLUX_VARIABLES_HH
+#endif // DUMUX_MODELS_2PDFM_FLUX_VARIABLES_HH
diff --git a/dumux/implicit/2pdfm/2pdfmindices.hh b/dumux/implicit/2pdfm/2pdfmindices.hh
index 6eafb196a9f5c743e03d198082f2404264fd2296..c9ca0611c01428fbc80e60dea5e90e02f31a5e87 100644
--- a/dumux/implicit/2pdfm/2pdfmindices.hh
+++ b/dumux/implicit/2pdfm/2pdfmindices.hh
@@ -20,8 +20,8 @@
  * \brief Defines the indices required for the finite volume in the
  *        two phase discrete fracture-matrix model.
  */
-#ifndef DUMUX_BOXMODELS_2PDFM_INDICES_HH
-#define DUMUX_BOXMODELS_2PDFM_INDICES_HH
+#ifndef DUMUX_MODELS_2PDFM_INDICES_HH
+#define DUMUX_MODELS_2PDFM_INDICES_HH
 
 #include<dumux/implicit/2p/2pindices.hh>
 
@@ -30,7 +30,7 @@ namespace Dumux
 // \{
 
 /*!
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  * \ingroup ImplicitIndices
  * \brief The common indices for the \f$p_w-S_n\f$ formulation of the
  *        isothermal two-phase discrete fracture-matrix model.
@@ -60,4 +60,4 @@ struct TwoPDFMIndices : public TwoPIndices <TypeTag, formulation, PVOffset>
 // \}
 } // namespace Dumux
 
-#endif // DUMUX_BOXMODELS_2PDFM_INDICES_HH
+#endif // DUMUX_MODELS_2PDFM_INDICES_HH
diff --git a/dumux/implicit/2pdfm/2pdfmlocalresidual.hh b/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
index f78b05b00bf011cbb33ed4ed368cc08a678771db..16c087a6fcdc81408ecd3172eef7a3355c313ee5 100644
--- a/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
+++ b/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
@@ -20,8 +20,8 @@
  * \brief Element-wise calculation of the residual for the finite volume in the
  *        two phase discrete fracture-matrix model.
  */
-#ifndef DUMUX_BOXMODELS_2PDFM_LOCAL_RESIDUAL_HH
-#define DUMUX_BOXMODELS_2PDFM_LOCAL_RESIDUAL_HH
+#ifndef DUMUX_MODELS_2PDFM_LOCAL_RESIDUAL_HH
+#define DUMUX_MODELS_2PDFM_LOCAL_RESIDUAL_HH
 
 #include <dumux/implicit/2p/2plocalresidual.hh>
 #include "2pdfmproperties.hh"
@@ -29,7 +29,7 @@
 namespace Dumux
 {
 /*!
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  * \ingroup ImplicitLocalResidual
  * \brief Element-wise calculation of the Jacobian matrix for problems
  *        using the two-phase discrete fracture fully implicit model.
@@ -333,4 +333,4 @@ private:
 
 } // end namespace
 
-#endif // DUMUX_BOXMODELS_2PDFM_LOCAL_RESIDUAL_HH
+#endif // DUMUX_MODELS_2PDFM_LOCAL_RESIDUAL_HH
diff --git a/dumux/implicit/2pdfm/2pdfmmodel.hh b/dumux/implicit/2pdfm/2pdfmmodel.hh
index 9156cc08b6c0e2096ba761b7a3c31fd9863b502e..7a14d3c39755dbd49fca3f4502d206418ad650a7 100644
--- a/dumux/implicit/2pdfm/2pdfmmodel.hh
+++ b/dumux/implicit/2pdfm/2pdfmmodel.hh
@@ -22,8 +22,8 @@
 *        model.
 */
 
-#ifndef DUMUX_BOXMODELS_2PDFM_MODEL_HH
-#define DUMUX_BOXMODELS_2PDFM_MODEL_HH
+#ifndef DUMUX_MODELS_2PDFM_MODEL_HH
+#define DUMUX_MODELS_2PDFM_MODEL_HH
 
 #include <dumux/implicit/2p/2pmodel.hh>
 #include "2pdfmproperties.hh"
@@ -32,7 +32,7 @@ namespace Dumux
 {
 
 /*!
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  * \brief A two-phase, isothermal flow model using the fully implicit scheme.
  *
  * This model implements two-phase flow of two immiscible fluids
@@ -75,4 +75,4 @@ class TwoPDFMModel : public TwoPModel<TypeTag>
 
 #include "2pdfmpropertydefaults.hh"
 
-#endif // DUMUX_BOXMODELS_2PDFM_MODEL_HH
+#endif // DUMUX_MODELS_2PDFM_MODEL_HH
diff --git a/dumux/implicit/2pdfm/2pdfmproblem.hh b/dumux/implicit/2pdfm/2pdfmproblem.hh
index 68aef463996c9e24a0116cf846924ebae66ca346..62b71d2fe723ba76641febe88994080a028da450 100644
--- a/dumux/implicit/2pdfm/2pdfmproblem.hh
+++ b/dumux/implicit/2pdfm/2pdfmproblem.hh
@@ -18,8 +18,8 @@
  * \file
  * \brief Base class for all problems which use the two-phase DFM fully implicit model
  */
-#ifndef DUMUX_BOXMODELS_2PDFM_PROBLEM_HH
-#define DUMUX_BOXMODELS_2PDFM_PROBLEM_HH
+#ifndef DUMUX_MODELS_2PDFM_PROBLEM_HH
+#define DUMUX_MODELS_2PDFM_PROBLEM_HH
 
 #include <dumux/implicit/common/implicitporousmediaproblem.hh>
 #include "2pdfmproperties.hh"
@@ -28,7 +28,7 @@ namespace Dumux
 {
 /*!
  * \ingroup ImplicitBaseProblems
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  * \brief Base class for all problems which use the two-phase DFM fully implicit model
  */
 template<class TypeTag>
@@ -60,4 +60,4 @@ public:
 };
 } // end namespace
 
-#endif // DUMUX_BOXMODELS_2PDFM_PROBLEM_HH
+#endif // DUMUX_MODELS_2PDFM_PROBLEM_HH
diff --git a/dumux/implicit/2pdfm/2pdfmproperties.hh b/dumux/implicit/2pdfm/2pdfmproperties.hh
index 8cacb817ccf82ec438c0fb5f0ac4bb7e47fafac1..0a2e38fc66b3f13fcc0d34c48399e41c51b7f871 100644
--- a/dumux/implicit/2pdfm/2pdfmproperties.hh
+++ b/dumux/implicit/2pdfm/2pdfmproperties.hh
@@ -21,11 +21,11 @@
  * 
  * \ingroup Properties
  * \ingroup ImplicitProperties
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  */
 
-#ifndef DUMUX_BOXMODELS_2PDFM_PROPERTIES_HH
-#define DUMUX_BOXMODELS_2PDFM_PROPERTIES_HH
+#ifndef DUMUX_MODELS_2PDFM_PROPERTIES_HH
+#define DUMUX_MODELS_2PDFM_PROPERTIES_HH
 
 #include <dumux/implicit/box/boxproperties.hh>
 #include <dumux/implicit/cellcentered/ccproperties.hh>
@@ -69,4 +69,4 @@ NEW_PROP_TAG(VtkAddVelocity); //!< Returns whether velocity vectors are written
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_BOXMODELS_2PDFM_PROPERTIES_HH
+#endif // DUMUX_MODELS_2PDFM_PROPERTIES_HH
diff --git a/dumux/implicit/2pdfm/2pdfmpropertydefaults.hh b/dumux/implicit/2pdfm/2pdfmpropertydefaults.hh
index 232bd09e4c89d49740544cc2e1b5412a2ed36929..3070bef52a73f7077de154ab4dbadfd0143b8207 100644
--- a/dumux/implicit/2pdfm/2pdfmpropertydefaults.hh
+++ b/dumux/implicit/2pdfm/2pdfmpropertydefaults.hh
@@ -21,11 +21,11 @@
  *        2pDFM fully implicit model.
  * 
  * \ingroup Properties
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  * \ingroup ImplicitProperties
  */
-#ifndef DUMUX_BOXMODELS_2PDFM_PROPERTY_DEFAULTS_HH
-#define DUMUX_BOXMODELS_2PDFM_PROPERTY_DEFAULTS_HH
+#ifndef DUMUX_MODELS_2PDFM_PROPERTY_DEFAULTS_HH
+#define DUMUX_MODELS_2PDFM_PROPERTY_DEFAULTS_HH
 
 #include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
 #include <dumux/material/components/nullcomponent.hh>
@@ -142,4 +142,4 @@ SET_BOOL_PROP(TwoPDFM, ProblemEnableGravity, true);
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_BOXMODELS_2PDFM_PROPERTY_DEFAULTS_HH
+#endif // DUMUX_MODELS_2PDFM_PROPERTY_DEFAULTS_HH
diff --git a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
index 4a4a065cca106dfe11f4bed536d9772085ae1d60..8ec6e8e638d9a2d9c2c219655233d872084788be 100644
--- a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
@@ -20,8 +20,8 @@
  * \brief Contains the quantities which are constant within a
  *        finite volume in the two-phase discrete fracture-matrix model.
  */
-#ifndef DUMUX_BOXMODELS_2PDFM_VOLUME_VARIABLES_HH
-#define DUMUX_BOXMODELS_2PDFM_VOLUME_VARIABLES_HH
+#ifndef DUMUX_MODELS_2PDFM_VOLUME_VARIABLES_HH
+#define DUMUX_MODELS_2PDFM_VOLUME_VARIABLES_HH
 
 #include <dune/common/fvector.hh>
 
@@ -32,7 +32,7 @@
 namespace Dumux
 {
 /*!
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  * \ingroup ImplicitVolumeVariables
  * \brief Contains the quantities which are are constant within a
  *        finite volume in the two-phase discrete fracture-matrix model.
@@ -387,4 +387,4 @@ private:
 };
 } // end namespace
 
-#endif // DUMUX_BOXMODELS_2PDFM_VOLUME_VARIABLES_HH
+#endif // DUMUX_MODELS_2PDFM_VOLUME_VARIABLES_HH
diff --git a/test/implicit/2pdfm/2pdfmspatialparams.hh b/test/implicit/2pdfm/2pdfmspatialparams.hh
index 39f2a7b0b4ddd87bdf07c8158c2f4afce38211d8..2a5886ca0670daec24ccb8c3b4950e9bc82940d3 100644
--- a/test/implicit/2pdfm/2pdfmspatialparams.hh
+++ b/test/implicit/2pdfm/2pdfmspatialparams.hh
@@ -58,10 +58,10 @@ public:
 };
 }
 /*!
- * \ingroup TwoPBoxModel
+ * \ingroup TwoPModel
  * \ingroup ImplicitTestProblems
  * \brief The spatial parameters for the 2PDFMProblem which uses the
- *        twophase box model
+ *        twophase model
  */
 template<class TypeTag>
 class TwoPDFMSpatialParams : public ImplicitSpatialParams<TypeTag>
diff --git a/test/implicit/2pdfm/2pdfmtestproblem.hh b/test/implicit/2pdfm/2pdfmtestproblem.hh
index 05c6b451bbecec3773670a9c7a0a808161801dea..1641a4226bcfdd08468a721297b36a0365773b54 100644
--- a/test/implicit/2pdfm/2pdfmtestproblem.hh
+++ b/test/implicit/2pdfm/2pdfmtestproblem.hh
@@ -105,7 +105,7 @@ SET_BOOL_PROP(TwoPDFMTestProblem, ProblemEnableGravity, false);
 }
 
 /*!
- * \ingroup TwoPDFMBoxModel
+ * \ingroup TwoPDFMModel
  * \ingroup ImplicitTestProblems
  * \brief Soil contamination problem involving a DNAPL migration into a
  *        fully water saturated media