diff --git a/dumux/porousmediumflow/2pnc/implicit/localresidual.hh b/dumux/porousmediumflow/2pnc/implicit/localresidual.hh
index bddf0fe962bf756d087bc47d5b8cf14eb19e4481..c51654f0f4e3dc840d81af7aa601a8f0c4c75c86 100644
--- a/dumux/porousmediumflow/2pnc/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/localresidual.hh
@@ -62,7 +62,6 @@ protected:
     typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
     typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
 
-    typedef CompositionalFluidState<Scalar, FluidSystem> FluidState;
     typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
 
     enum
diff --git a/dumux/porousmediumflow/2pnc/implicit/model.hh b/dumux/porousmediumflow/2pnc/implicit/model.hh
index 66a1d4fda00d2dad81516427c56ac599eaadb7d6..3686dd11d62b25b4d924a34af912a4dbd7faca8c 100644
--- a/dumux/porousmediumflow/2pnc/implicit/model.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/model.hh
@@ -138,8 +138,6 @@ class TwoPNCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
             formulation = GET_PROP_VALUE(TypeTag, Formulation)
     };
 
-    typedef CompositionalFluidState<Scalar, FluidSystem> FluidState;
-
     typedef typename GridView::template Codim<dim>::Entity Vertex;
     typedef typename GridView::template Codim<0>::Entity Element;
 
diff --git a/dumux/porousmediumflow/3p/implicit/volumevariables.hh b/dumux/porousmediumflow/3p/implicit/volumevariables.hh
index 5694d98fc3aa19c16f6f850dbf2743c3c8293530..35e11d76a7930cb093449ad9e67f9bc652293f27 100644
--- a/dumux/porousmediumflow/3p/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/3p/implicit/volumevariables.hh
@@ -78,7 +78,7 @@ class ThreePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
 
 public:
     //! The type of the object returned by the fluidState() method
-    typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> FluidState;
+    typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
 
 
     /*!
diff --git a/dumux/porousmediumflow/co2/implicit/volumevariables.hh b/dumux/porousmediumflow/co2/implicit/volumevariables.hh
index d54cd52f3c464191c97095283095a50875dab533..ff328761465fd08f9a372e32b9312981cc956316 100644
--- a/dumux/porousmediumflow/co2/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/co2/implicit/volumevariables.hh
@@ -97,7 +97,7 @@ class CO2VolumeVariables: public TwoPTwoCVolumeVariables<TypeTag>
 
 public:
     //! The type of the object returned by the fluidState() method
-    typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> FluidState;
+    typedef typename ParentType::FluidState FluidState;
 
 
     /*!