diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index 27c452011..0ec88e80a 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -109,10 +109,11 @@ class BlackOilIntensiveQuantities
     using Toolbox = MathToolbox<Evaluation>;
     using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
     using FluxIntensiveQuantities = typename FluxModule::FluxIntensiveQuantities;
-    using FluidState = BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled,  enableEvaporation, enableBrine, enableSaltPrecipitation, Indices::numPhases >;
+    
     using DiffusionIntensiveQuantities = BlackOilDiffusionIntensiveQuantities<TypeTag, enableDiffusion>;
 
 public:
+    using FluidState = BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled,  enableEvaporation, enableBrine, enableSaltPrecipitation, Indices::numPhases >;
     BlackOilIntensiveQuantities()
     {
         if (compositionSwitchEnabled) {
diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
index eda11d0bf..75f1a7ce4 100644
--- a/opm/models/blackoil/blackoillocalresidualtpfa.hh
+++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -25,8 +25,8 @@
  *
  * \copydoc Opm::BlackOilLocalResidual
  */
-#ifndef EWOMS_BLACK_OIL_LOCAL_RESIDUAL_HH
-#define EWOMS_BLACK_OIL_LOCAL_RESIDUAL_HH
+#ifndef EWOMS_BLACK_OIL_LOCAL_TPFA_RESIDUAL_HH
+#define EWOMS_BLACK_OIL_LOCAL_TPFA_RESIDUAL_HH
 
 #include "blackoilproperties.hh"
 #include "blackoilsolventmodules.hh"
@@ -46,7 +46,7 @@ namespace Opm {
  * \brief Calculates the local residual of the black oil model.
  */
 template <class TypeTag>
-class BlackOilLocalResidual : public GetPropType<TypeTag, Properties::DiscLocalResidual>
+class BlackOilLocalResidualTPFA : public GetPropType<TypeTag, Properties::DiscLocalResidual>
 {
     using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
     using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;