diff --git a/doc/doxygen/modules b/doc/doxygen/modules
index 5648fd6cf1505f5b1f81405cb737f834ea49930d..186582d2aaa2a9cb2f59d4111e62fdaf8982dbc1 100644
--- a/doc/doxygen/modules
+++ b/doc/doxygen/modules
@@ -277,6 +277,12 @@
      * \ingroup Sequential
      * \defgroup IMPET Models
      */     
+	
+		/*!
+		* \ingroup IMPET
+		* \defgroup mpfa MPFA framework
+		*/
+	  
         /*!
          * \ingroup IMPET
          * \defgroup OnePhase Single Phase (FV)
diff --git a/dumux/decoupled/2p/2pindices.hh b/dumux/decoupled/2p/2pindices.hh
index e325c5075309577439388d1da741b3adcbb30da2..12fe9e2cca1885d05ae6e7a2ca5035bf16107a3c 100644
--- a/dumux/decoupled/2p/2pindices.hh
+++ b/dumux/decoupled/2p/2pindices.hh
@@ -53,16 +53,19 @@ struct DecoupledTwoPCommonIndices
 
     //saturation flags
     static const int saturationW = 0; //!< Indicates wetting phase saturation
-    static const int saturationNw = 1; //!<  Indicates non-wetting phase saturation
+    static const int saturationN = 1; //!<  Indicates non-wetting phase saturation
+    static const int saturationNw = saturationN; //!<  Indicates non-wetting phase saturation
 
     //pressure flags
     static const int pressureW = 0; //!< Indicates wetting phase pressure
-    static const int pressureNw = 1; //!<  Indicates non-wetting phase pressure
+    static const int pressureN = 1; //!<  Indicates non-wetting phase pressure
+    static const int pressureNw = pressureN; //!<  Indicates non-wetting phase pressure
     static const int pressureGlobal = 2; //!<  Indicates global-pressure
 
     //velocity flags
     static const int velocityW = 0; //!< Indicates wetting phase velocity
-    static const int velocityNw = 1; //!<  Indicates non-wetting phase velocity
+    static const int velocityN = 1; //!<  Indicates non-wetting phase velocity
+    static const int velocityNw = velocityN; //!<  Indicates non-wetting phase velocity
     static const int velocityTotal = 2; //!<  Indicates total velocity
 };
 
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dtransmissibilitycalculator.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dtransmissibilitycalculator.hh
index fb80cc97c86571fdc14f8c7f33ffcaaad8967776..57b94095c3a058e5245ae2f231254f5495d61808 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dtransmissibilitycalculator.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dtransmissibilitycalculator.hh
@@ -30,7 +30,7 @@
 
 namespace Dumux
 {
-//! \ingroup FVPressure2p
+//! \ingroup FVPressure2p mpfa
 /*! \brief Provides methods for transmissibility calculation in 2-d.
  *
  *  The transmissibilities are calculated using the MPFA L-method.
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
index e1473b332f7c2016729b45a39cadc5ed2e952f1c..bf2a0f36c9536bb1a816182237d33414ae4132c9 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
@@ -37,7 +37,7 @@ bool sort_compare(const std::vector<int>& entryI, const std::vector<int>& entryJ
     return (entryI[1] < entryJ[1]);
 }
 
-//! \ingroup FVPressure2p
+//! \ingroup FVPressure2p mpfa
 /*! \brief Interactionvolume container for 3-d MPFA L-method
  *
  * Container class which stores MPFA-interaction-volume information for each vertex of a DUNE grid.
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
index 3fc27a8bbb834d78f58f4fe2f5f49c8cff5123d7..891fbb4425152b24a7988ab6a486d1dd56c49b93 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
@@ -33,7 +33,7 @@
 namespace Dumux
 {
 
-//! \ingroup FVPressure2p
+//! \ingroup FVPressure2p mpfa
 /*! \brief Interactionvolume container for 3-d MPFA L-method on an h-adaptive grid
  *
  * Container class which stores MPFA-interaction-volume information for each vertex of a DUNE grid.
diff --git a/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh b/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
index 1f0a77c9528af73ed4172633dcb007e4fdd50748..18d58778cdff1424ae94f70de29d1219eb16d012 100644
--- a/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
@@ -32,7 +32,7 @@
 namespace Dumux
 {
 /*!
- * \ingroup Adaptive2p2c
+ * \ingroup Adaptive2p2c mpfa
  */
 //! Class holding additionally mpfa data of adaptive compositional models.
 /*!
diff --git a/dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh b/dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh
index 74e7f7a55f2962b6061b155dc9f23ad241e2b447..6069a2ea9967e94f5c8b8553ae93581d75c8884b 100644
--- a/dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh
+++ b/dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh
@@ -19,7 +19,7 @@
 
 /*!
  * \ingroup IMPET
- * \ingroup IMPETProperties
+ * \ingroup IMPETProperties mpfa
  * \file
  *
  * \brief Properties for a MPFA method.