diff --git a/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh b/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
index 7dcc6eb9bb7b4936a66a8be871b92b451e7bf88c..34534ec3b127ff23228b949d8d871e688d4d441d 100644
--- a/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
+++ b/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
@@ -25,7 +25,7 @@
  * \file
  *
  * \brief Contains the quantities to calculate the energy flux in the
- *        mpnc box model.
+ *        MpNc box model.
  */
 #ifndef DUMUX_MPNC_ENERGY_FLUX_VARIABLES_HH
 #define DUMUX_MPNC_ENERGY_FLUX_VARIABLES_HH
diff --git a/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh b/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
index 4e9cc477843a4dde91ce3eddd81c4f69b2c5c824..40cf403313677c1f6c2e7306b3cf7b6caf6221ca 100644
--- a/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
+++ b/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
@@ -23,7 +23,7 @@
  * \file
  *
  * \brief VTK writer module for the energy related quantities of the
- *        mpnc model.
+ *        MpNc model.
  */
 #ifndef DUMUX_MPNC_VTK_WRITER_ENERGY_HH
 #define DUMUX_MPNC_VTK_WRITER_ENERGY_HH
@@ -36,7 +36,7 @@ namespace Dumux
  * \ingroup MPNCModel
  *
  * \brief VTK writer module for the energy related quantities of the
- *        mpnc model.
+ *        MpNc model.
  *
  * This is the specialization for the case without energy.
  */
@@ -123,7 +123,7 @@ private:
  * \ingroup MPNCModel
  *
  * \brief VTK writer module for the energy related quantities of the
- *        mpnc model.
+ *        MpNc model.
  *
  * This is the specialization for the case with an energy equation but
  * local thermal equilibrium. (i.e. no kinetic energy transfer)
diff --git a/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh b/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
index 7e5f513140d72023b34fc8f2a0f16d170485505a..1c4bb2cbb913a7e491672b2f77221a40972bdd26 100644
--- a/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
+++ b/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
@@ -23,7 +23,7 @@
  * \file
  *
  * \brief VTK writer module for the mass related quantities of the
- *        mpnc model.
+ *        MpNc model.
  */
 #ifndef DUMUX_MPNC_VTK_WRITER_MASS_HH
 #define DUMUX_MPNC_VTK_WRITER_MASS_HH
@@ -36,7 +36,7 @@ namespace Dumux
  * \ingroup MPNCModel
  *
  * \brief VTK writer module for the mass related quantities of the
- *        mpnc model.
+ *        MpNc model.
  *
  * This is the specialization for the case _without_ kinetic mass
  * transfer between phases.
diff --git a/dumux/boxmodels/mpnc/mpncindices.hh b/dumux/boxmodels/mpnc/mpncindices.hh
index 4d815a4b18930e6aa3f70faf3534e1d892e0cb79..0508a45de4631b5dde2810fc7f2dd14e9af1ceea 100644
--- a/dumux/boxmodels/mpnc/mpncindices.hh
+++ b/dumux/boxmodels/mpnc/mpncindices.hh
@@ -32,7 +32,7 @@ namespace Dumux
 /*!
  * \ingroup MPNCModel
  * \ingroup BoxIndices
- * \brief The primary variable and equation indices for the mpnc
+ * \brief The primary variable and equation indices for the MpNc
  *        model.
  */
 template <class TypeTag, int BasePVOffset = 0>
diff --git a/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh b/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
index 69e937c00835fb2ca03d3bd1893fd8ec57f87cab..255dd09a31a1f64266999e58caf651449bf3bc24 100644
--- a/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
+++ b/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
@@ -22,7 +22,7 @@
  *****************************************************************************/
 /*!
  * \file
- * \brief A mpnc specific controller for the newton solver.
+ * \brief A MpNc specific controller for the newton solver.
  *
  * This controller 'knows' what a 'physically meaningful' solution is
  * which allows the newton method to abort quicker if the solution is
@@ -39,7 +39,7 @@
 namespace Dumux {
 
 template <class TypeTag, bool enableKinetic /* = false */>
-class mpncNewtonChop
+class MpNcNewtonChop
 {
     typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -90,7 +90,7 @@ private:
 };
 
 template <class TypeTag>
-class mpncNewtonChop<TypeTag, /*enableKinetic=*/true>
+class MpNcNewtonChop<TypeTag, /*enableKinetic=*/true>
 {
     typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -153,7 +153,7 @@ private:
 
 /*!
  * \ingroup Newton
- * \brief A mpnc specific controller for the newton solver.
+ * \brief A MpNc specific controller for the newton solver.
  *
  * This controller 'knows' what a 'physically meaningful' solution is
  * which allows the newton method to abort quicker if the solution is
@@ -180,7 +180,7 @@ class MPNCNewtonController : public NewtonController<TypeTag>
         S0Idx = Indices::S0Idx
     };
 
-    typedef mpncNewtonChop<TypeTag, enableKinetic> NewtonChop;
+    typedef MpNcNewtonChop<TypeTag, enableKinetic> NewtonChop;
 
 public:
     MPNCNewtonController(const Problem &problem)
diff --git a/dumux/boxmodels/mpnc/mpncproperties.hh b/dumux/boxmodels/mpnc/mpncproperties.hh
index 198d35a29b40e77f1659efc1db33962674741730..0e59947c24a119cc00a6471e4fd5f12b905f2ed6 100644
--- a/dumux/boxmodels/mpnc/mpncproperties.hh
+++ b/dumux/boxmodels/mpnc/mpncproperties.hh
@@ -27,7 +27,7 @@
 /*!
  * \ingroup Properties
  * \ingroup BoxProperties
- * \ingroup BoxmpncModel
+ * \ingroup BoxMpNcModel
  * \file
  * \brief  Defines the properties required for the Mp-Nc box model.
  */
diff --git a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
index 0e41434bf6380360acb139d93c8a092693bd6160..26f5abfbe97465b0401bc354f54f0e2cbdfcc34f 100644
--- a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
+++ b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
@@ -45,7 +45,7 @@
 /*!
  * \ingroup Properties
  * \ingroup BoxProperties
- * \ingroup BoxmpncModel
+ * \ingroup BoxMpNcModel
  * \file
  * \brief  Default properties for the Mp-Nc box model.
  */
@@ -125,12 +125,12 @@ public:
     typedef Dumux::CompositionFromFugacities<Scalar, FluidSystem> type;
 };
 
-//! Use the mpnc local jacobian operator for the mpnc model
+//! Use the MpNc local jacobian operator for the MpNc model
 SET_TYPE_PROP(BoxMPNC,
               LocalResidual,
               MPNCLocalResidual<TypeTag>);
 
-//! Use the mpnc specific newton controller for the mpnc model
+//! Use the MpNc specific newton controller for the MpNc model
 SET_PROP(BoxMPNC, NewtonController)
 {public:
     typedef MPNCNewtonController<TypeTag> type;
diff --git a/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh b/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
index aa06c34700634536f8fc282fab558a66824557ea..4e5bff63241c17c026572b13ab627f00a42b551c 100644
--- a/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
+++ b/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
@@ -22,7 +22,7 @@
 /*!
  * \file
  *
- * \brief VTK writer module for the common quantities of the mpnc
+ * \brief VTK writer module for the common quantities of the MpNc
  *        model.
  */
 #ifndef DUMUX_MPNC_VTK_WRITER_COMMON_HH
@@ -36,7 +36,7 @@ namespace Dumux
 /*!
  * \ingroup MPNCModel
  *
- * \brief VTK writer module for the common quantities of the mpnc
+ * \brief VTK writer module for the common quantities of the MpNc
  *        model.
  */
 template<class TypeTag>