diff --git a/dumux/material/fluidsystems/brineco2fluidsystem.hh b/dumux/material/fluidsystems/brineco2fluidsystem.hh
index 8287570d3bdbb33a8559fee949a1a34a0294a0dc..8f97fbaa6e32cbe0e70e29f547a3f7f8fa1cf778 100644
--- a/dumux/material/fluidsystems/brineco2fluidsystem.hh
+++ b/dumux/material/fluidsystems/brineco2fluidsystem.hh
@@ -62,11 +62,11 @@ namespace FluidSystems{
  */
 template<class Scalar,
          class CO2Table,
-         class H2Otype = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar>>,
-         class BrineRawComponent = Dumux::Brine<Scalar, Dumux::H2O<Scalar>>,
+         class H2Otype = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> >,
+         class BrineRawComponent = Dumux::Brine<Scalar, Dumux::H2O<Scalar> >,
          class Brinetype = Dumux::TabulatedComponent<Scalar, BrineRawComponent> >
 class BrineCO2
-: public BaseFluidSystem<Scalar, BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype>>
+: public BaseFluidSystem<Scalar, BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype> >
 {
     typedef BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype> ThisType;
     typedef BaseFluidSystem <Scalar, ThisType> Base;
@@ -749,7 +749,7 @@ SET_SCALAR_PROP(NumericModel, ProblemSalinity, 1e-3);
             typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
                 // Do not use the defaults that are the following
                 //    typedef Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > H2O;
-                //    typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar>>  BrineRawComponent;
+                //    typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar> >  BrineRawComponent;
                 //    typedef Dumux::TabulatedComponent<Scalar,BrineRawComponent > Brine;
 
             // Apply the following component classes:
diff --git a/dumux/material/fluidsystems/defaultcomponents.hh b/dumux/material/fluidsystems/defaultcomponents.hh
index 73a3fe93d1331a41fc1c30e592b875b2e1c44d21..a709d4cec18a770925fc3f3adc315292d9b8c92d 100644
--- a/dumux/material/fluidsystems/defaultcomponents.hh
+++ b/dumux/material/fluidsystems/defaultcomponents.hh
@@ -68,7 +68,7 @@ public:
     typedef Dumux::CH4<Scalar> CH4;
     typedef Dumux::SimpleCO2<Scalar> SimpleCO2;
     typedef Dumux::SimpleH2O<Scalar> SimpleH2O;
-    typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar>> BrineRawComponent;
+    typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar> > BrineRawComponent;
     typedef Dumux::TabulatedComponent<Scalar, BrineRawComponent > Brine;
 
     static void init()