diff --git a/doc/doxygen/modules.txt b/doc/doxygen/modules.txt
index 4a90a1e389ba0f223a34cb9aff19b886037e980f..9fc5b053fe37e10344f51b7192bc987e413fbbdc 100644
--- a/doc/doxygen/modules.txt
+++ b/doc/doxygen/modules.txt
@@ -127,37 +127,18 @@
          *
          * \copydetails Dumux::TwoPModel
          */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup TwoPNIModel Non-isothermal two-phase
-         *
-         * \copydetails Dumux::TwoPNIModel
-         */
         /*!
          * \ingroup ImplicitModels
          * \defgroup TwoPTwoCModel Two-phase, two-component
          *
          * \copydetails Dumux::TwoPTwoCModel
          */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup TwoPTwoCNIModel Non-isothermal two-phase, two-component
-         *
-         * \copydetails Dumux::TwoPTwoCNIModel
-         */
         /*!
          * \ingroup ImplicitModels
          * \defgroup CO2Model CO2
          *
          * \copydetails Dumux::CO2Model
          */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup CO2NIModel Non-isothermal CO2
-         *
-         * \copydetails Dumux::CO2NIModel
-         */
-        /*!
          * \ingroup ImplicitModels
          * \defgroup TwoPDFMModel Two-phase flow in discrete fracture-matrix
          *
@@ -175,12 +156,6 @@
          *
          * \copydetails Dumux::ThreePThreeCModel
          */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup ThreePThreeCNIModel Non-isothermal three-phase, three-component
-         *
-         * \copydetails Dumux::ThreePThreeCNIModel
-         */
         /*!
          * \ingroup ImplicitModels
          * \defgroup MPNCModel M-phase N-component
@@ -205,12 +180,6 @@
          *
          * \copydetails Dumux::StokesncModel
          */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup BoxStokesncniModel Non-isothermal N-component Stokes
-         *
-         * \copydetails Dumux::StokesncniModel
-         */
         /*!
          * \ingroup ImplicitModels
          * \defgroup BoxZeroEqModel ZeroEq
@@ -223,30 +192,6 @@
          *
          * \copydetails Dumux::ZeroEqncModel
          */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup BoxZeroEqncniModel Non-isothermal N-component ZeroEq
-         *
-         * \copydetails Dumux::ZeroEqncniModel
-         */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup BoxZeroEqModel ZeroEq
-         *
-         * \copydetails Dumux::ZeroEqModel
-         */
-         /*!
-         * \ingroup ImplicitModels
-         * \defgroup BoxZeroEqncModel N-component ZeroEq
-         *
-         * \copydetails Dumux::ZeroEqncModel
-         */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup BoxZeroEqncniModel Non-isothermal N-component ZeroEq
-         *
-         * \copydetails Dumux::ZeroEqncniModel
-         */
         /*!
          * \ingroup ImplicitModels
          * \defgroup ElasticBoxModel Linear elastic
@@ -279,16 +224,6 @@
          * <br>
          * \copydetails Dumux::StokesncModel
          */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup TwoPTwoCNIStokesTwoCNIModel Non-isothermal, two-component, Stokes-Darcy
-         *
-         * \copydetails Dumux::TwoCNIStokesTwoPTwoCNILocalOperator
-         * <br><br><br>
-         * \copydetails Dumux::TwoPTwoCNIModel
-         * <br>
-         * \copydetails Dumux::StokesncniModel
-         */
         /*!
          * \ingroup ImplicitModels
          * \defgroup TwoPTwoCZeroEqTwoCModel Two-component, ZeroEq turbulence-Darcy
@@ -299,16 +234,6 @@
          * <br>
          * \copydetails Dumux::ZeroEqncModel
          */
-        /*!
-         * \ingroup ImplicitModels
-         * \defgroup TwoPTwoCNIZeroEqTwoCNIModel Non-isothermal, two-component, ZeroEq turbulence-Darcy
-         *
-         * \copydetails Dumux::TwoCNIStokesTwoPTwoCNILocalOperator
-         * <br><br><br>
-         * \copydetails Dumux::TwoPTwoCNIModel
-         * <br>
-         * \copydetails Dumux::ZeroEqncniModel
-         */
     /*!
      * \ingroup ImplicitModel
      * \defgroup ImplicitBaseProblems Base Problems
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index 4998e6d50c0a18a1611524409abcb290f021533d..be778c6248b01c73fc531748256280f5dfdbd123 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 BoxStokesncniModel
+ * \ingroup BoxStokesncModel
  * \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 7e98ce796ac107ab24daa1cc98f81a5cce727210..bb9e6f0a6fbe8754e9eed3a98be214409724af24 100644
--- a/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
+++ b/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
@@ -64,7 +64,7 @@ SET_BOOL_PROP(ZeroEq2cniTestProblem, ProblemEnableGravity, false);
 }
 
 /*!
- * \ingroup BoxZeroEqncniModel
+ * \ingroup BoxZeroEqncModel
  * \ingroup ImplicitTestProblems
  * \brief Non-isothermal compositional ZeroEqncni flow problem.
  *
diff --git a/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
index 410c452d5a0db31ee085163f25b4fbd9fd1f5056..4ecc6f798cabd0c01ff2f56f6d54d901a8ad19da 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
@@ -77,7 +77,7 @@ SET_BOOL_PROP(OnePTwoCNIConductionProblem, ProblemEnableGravity, false);
 
 
 /*!
- * \ingroup OnePTwoCNIModel
+ * \ingroup OnePTwoCModel
  * \ingroup ImplicitTestProblems
  *
  * \brief Test for the OnePTwoCModel in combination with the NI model for a conduction problem:
diff --git a/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
index c73de2d7b5220321470d1da5625581ff8170791b..d1307cd3a97e3398c49fe79c2e14443e34d38899 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
@@ -71,7 +71,7 @@ SET_BOOL_PROP(OnePTwoCNIConvectionProblem, UseMoles, true);
 
 
 /*!
- * \ingroup OnePTwoCNIModel
+ * \ingroup OnePTwoCModel
  * \ingroup ImplicitTestProblems
  *
  * \brief Test for the OnePTwoCModel in combination with the NI model for a convection problem:
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
index 293867209249115a1599467fa21956bbc5dab17e..90c8c6e921e7f5140fdb9e3880d1a962cc220fe2 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
@@ -82,7 +82,7 @@ SET_BOOL_PROP(HeterogeneousNIProblem, UseMoles, false);
 
 
 /*!
- * \ingroup CO2NIModel
+ * \ingroup CO2Model
  * \ingroup ImplicitTestProblems
  * \brief Definition of a problem, where CO2 is injected in a reservoir.
  *