diff --git a/examples/problems/co2injectionproblem.hh b/examples/problems/co2injectionproblem.hh
index e5f37cce1..1c38dba76 100644
--- a/examples/problems/co2injectionproblem.hh
+++ b/examples/problems/co2injectionproblem.hh
@@ -99,8 +99,8 @@ private:
     typedef Ewoms::Co2Injection::CO2Tables CO2Tables;
 
 public:
-    typedef Opm::FluidSystems::BrineCO2<Scalar, CO2Tables> type;
-    //typedef Opm::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
+    typedef Opm::BrineCO2FluidSystem<Scalar, CO2Tables> type;
+    //typedef Opm::H2ON2FluidSystem<Scalar, /*useComplexRelations=*/false> type;
 };
 
 // Set the material Law
diff --git a/examples/problems/cuvetteproblem.hh b/examples/problems/cuvetteproblem.hh
index 82961a38f..481e2c2d9 100644
--- a/examples/problems/cuvetteproblem.hh
+++ b/examples/problems/cuvetteproblem.hh
@@ -71,7 +71,7 @@ SET_TYPE_PROP(CuvetteBaseProblem, Problem, Ewoms::CuvetteProblem<TypeTag>);
 // Set the fluid system
 SET_TYPE_PROP(
     CuvetteBaseProblem, FluidSystem,
-    Opm::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+    Opm::H2OAirMesityleneFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Enable gravity
 SET_BOOL_PROP(CuvetteBaseProblem, EnableGravity, true);
diff --git a/examples/problems/diffusionproblem.hh b/examples/problems/diffusionproblem.hh
index a60a8721b..3563baece 100644
--- a/examples/problems/diffusionproblem.hh
+++ b/examples/problems/diffusionproblem.hh
@@ -72,7 +72,7 @@ private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
 
 public:
-    typedef Opm::FluidSystems::H2ON2<Scalar> type;
+    typedef Opm::H2ON2FluidSystem<Scalar> type;
 };
 
 // Set the material Law
@@ -88,8 +88,7 @@ private:
 
     typedef Opm::TwoPhaseMaterialTraits<Scalar,
                                         /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx>
-    Traits;
+                                        /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits;
 
 public:
     typedef Opm::LinearMaterial<Traits> type;
diff --git a/examples/problems/infiltrationproblem.hh b/examples/problems/infiltrationproblem.hh
index 3d27eeaa4..58a2351cd 100644
--- a/examples/problems/infiltrationproblem.hh
+++ b/examples/problems/infiltrationproblem.hh
@@ -66,7 +66,7 @@ SET_TYPE_PROP(InfiltrationBaseProblem, Problem,
 // Set the fluid system
 SET_TYPE_PROP(
     InfiltrationBaseProblem, FluidSystem,
-    Opm::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+    Opm::H2OAirMesityleneFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Enable gravity?
 SET_BOOL_PROP(InfiltrationBaseProblem, EnableGravity, true);
diff --git a/examples/problems/obstacleproblem.hh b/examples/problems/obstacleproblem.hh
index 102ecb50d..5b9a31d94 100644
--- a/examples/problems/obstacleproblem.hh
+++ b/examples/problems/obstacleproblem.hh
@@ -69,7 +69,7 @@ SET_TYPE_PROP(ObstacleBaseProblem, Problem, Ewoms::ObstacleProblem<TypeTag>);
 
 // Set fluid configuration
 SET_TYPE_PROP(ObstacleBaseProblem, FluidSystem,
-              Opm::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+              Opm::H2ON2FluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Set the material Law
 SET_PROP(ObstacleBaseProblem, MaterialLaw)
diff --git a/examples/problems/outflowproblem.hh b/examples/problems/outflowproblem.hh
index 9421df93f..a98130581 100644
--- a/examples/problems/outflowproblem.hh
+++ b/examples/problems/outflowproblem.hh
@@ -63,7 +63,7 @@ private:
 
 public:
     // Two-component single phase fluid system
-    typedef Opm::FluidSystems::H2ON2LiquidPhase<Scalar> type;
+    typedef Opm::H2ON2LiquidPhaseFluidSystem<Scalar> type;
 };
 
 // Disable gravity
diff --git a/examples/problems/reservoirproblem.hh b/examples/problems/reservoirproblem.hh
index 55955ed74..c45e50012 100644
--- a/examples/problems/reservoirproblem.hh
+++ b/examples/problems/reservoirproblem.hh
@@ -130,7 +130,7 @@ private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
 
 public:
-    typedef Opm::FluidSystems::BlackOil<Scalar> type;
+    typedef Opm::BlackOilFluidSystem<Scalar> type;
 };
 
 // The default DGF file to load
diff --git a/examples/problems/waterairproblem.hh b/examples/problems/waterairproblem.hh
index 5ea8182e0..75a401009 100644
--- a/examples/problems/waterairproblem.hh
+++ b/examples/problems/waterairproblem.hh
@@ -107,7 +107,7 @@ SET_TYPE_PROP(WaterAirBaseProblem, SolidEnergyLaw,
 // Set the fluid system. in this case, we use the one which describes
 // air and water
 SET_TYPE_PROP(WaterAirBaseProblem, FluidSystem,
-              Opm::FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+              Opm::H2OAirFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Enable gravity
 SET_BOOL_PROP(WaterAirBaseProblem, EnableGravity, true);