diff --git a/doc/doxygen/modules.txt b/doc/doxygen/modules.txt
index 9fc5b053fe37e10344f51b7192bc987e413fbbdc..157aa1e76b82c204192e8eab05aa782aa45bf446 100644
--- a/doc/doxygen/modules.txt
+++ b/doc/doxygen/modules.txt
@@ -180,7 +180,13 @@
          *
          * \copydetails Dumux::StokesncModel
          */
-        /*!
+         /*!
+         * \ingroup ImplicitModels
+         * \defgroup BoxStokesncniModel Non-isothermal N-component Stokes
+         *
+         * \copydetails Dumux::StokesncniModel
+         */
+         /*!
          * \ingroup ImplicitModels
          * \defgroup BoxZeroEqModel ZeroEq
          *
@@ -192,6 +198,11 @@
          *
          * \copydetails Dumux::ZeroEqncModel
          */
+         /*!
+         * \defgroup BoxZeroEqncniModel Non-isothermal N-component ZeroEq
+         *
+         * \copydetails Dumux::ZeroEqncniModel
+         */
         /*!
          * \ingroup ImplicitModels
          * \defgroup ElasticBoxModel Linear elastic
@@ -362,4 +373,3 @@
      * \ingroup Sequential
      * \defgroup IMPETtests Test Problems
      */
-
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index be778c6248b01c73fc531748256280f5dfdbd123..4998e6d50c0a18a1611524409abcb290f021533d 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -65,7 +65,7 @@ SET_TYPE_PROP(Stokes2cniTestProblem, LinearSolver, UMFPackBackend<TypeTag>);
 }
 
 /*!
- * \ingroup BoxStokesncModel
+ * \ingroup BoxStokesncniModel
  * \ingroup ImplicitTestProblems
  * \brief Stokesncni problem with air flowing
  *        from the bottom to the top, blowing away a warm and dry square.
diff --git a/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh b/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
index bb9e6f0a6fbe8754e9eed3a98be214409724af24..7e98ce796ac107ab24daa1cc98f81a5cce727210 100644
--- a/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
+++ b/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
@@ -64,7 +64,7 @@ SET_BOOL_PROP(ZeroEq2cniTestProblem, ProblemEnableGravity, false);
 }
 
 /*!
- * \ingroup BoxZeroEqncModel
+ * \ingroup BoxZeroEqncniModel
  * \ingroup ImplicitTestProblems
  * \brief Non-isothermal compositional ZeroEqncni flow problem.
  *