diff --git a/dumux/material/constraintsolvers/compositionfromfugacities2pncmin.hh b/dumux/material/constraintsolvers/compositionfromfugacities2pncmin.hh
index 1d17f538ff432d3ff866ba1ebe6093b8ff6586e6..1596b9ef18fffa288b10f2f90a95992c6d9aa626 100644
--- a/dumux/material/constraintsolvers/compositionfromfugacities2pncmin.hh
+++ b/dumux/material/constraintsolvers/compositionfromfugacities2pncmin.hh
@@ -25,6 +25,7 @@
 #ifndef DUMUX_COMPOSITION_FROM_FUGACITIES_2PNCMIN_HH
 #define DUMUX_COMPOSITION_FROM_FUGACITIES_2PNCMIN_HH
 
+#include <dune/common/deprecated.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
 
@@ -32,14 +33,13 @@
 #include <dumux/common/valgrind.hh>
 
 namespace Dumux {
-
 /*!
  * \ingroup ConstraintSolver
  * \brief Calculates the chemical equilibrium from the component
  *        fugacities in a phase.
  */
 template <class Scalar, class FluidSystem>
-class compositionFromFugacities2pncmin
+class CompositionFromFugacities2pncmin
 {
     enum {
             numComponents = FluidSystem::numComponents,
@@ -142,6 +142,12 @@ protected:
         return;
     }
 };
+
+template <class Scalar, class FluidSystem>
+DUNE_DEPRECATED_MSG("compositionFromFugacities2pncmin is deprecated. Use CompositionFromFugacities2pncmin (capital C) instead.")
+class compositionFromFugacities2pncmin
+  : public CompositionFromFugacities2pncmin<Scalar, FluidSystem>
+{ };
 } // end namespace Dumux
 
 #endif
diff --git a/dumux/porousmediumflow/2pnc/implicit/model.hh b/dumux/porousmediumflow/2pnc/implicit/model.hh
index be59030ed2067c46d65be5b952e0c7ee79b5e6a3..8b7c2fef46bd20e6aaf29db1c37eccfdb529ec8d 100644
--- a/dumux/porousmediumflow/2pnc/implicit/model.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/model.hh
@@ -309,9 +309,9 @@ public:
         for (int j = 0; j < numComponents ; ++j)
             molarity[j] = writer.allocateManagedBuffer(numDofs);
 
-        ScalarField *Perm[dim];
+        ScalarField *perm[dim];
         for (int j = 0; j < dim; ++j) //Permeability only in main directions xx and yy
-            Perm[j] = writer.allocateManagedBuffer(numDofs);
+            perm[j] = writer.allocateManagedBuffer(numDofs);
 
         auto numElements = this->gridView_().size(0);
         ScalarField *rank = writer.allocateManagedBuffer (numElements);
@@ -356,7 +356,7 @@ public:
                 Tensor K = perm_(this->problem_().spatialParams().intrinsicPermeability(element, fvGeometry, scvIdx));
 
                 for (int j = 0; j<dim; ++j)
-                    (*Perm[j])[dofIdxGlobal] = K[j][j];
+                    (*perm[j])[dofIdxGlobal] = K[j][j];
             };
 
             // velocity output
@@ -378,11 +378,11 @@ public:
         writer.attachDofData(*mobG, "mobG", isBox);
         writer.attachDofData(*poro, "porosity", isBox);
         writer.attachDofData(*temperature, "temperature", isBox);
-        writer.attachDofData(*Perm[0], "Kxx", isBox);
+        writer.attachDofData(*perm[0], "Kxx", isBox);
         if (dim >= 2)
-            writer.attachDofData(*Perm[1], "Kyy", isBox);
+            writer.attachDofData(*perm[1], "Kyy", isBox);
         if (dim == 3)
-            writer.attachDofData(*Perm[2], "Kzz", isBox);
+            writer.attachDofData(*perm[2], "Kzz", isBox);
 
         for (int i = 0; i < numPhases; ++i)
         {