diff --git a/exercises/exercise-fluidsystem/2pproblem.hh b/exercises/exercise-fluidsystem/2pproblem.hh
index 9a9a4b5f2ef28ca082aae13066d4c0a85314f61f..81dba41a6499cab21bcba5ceafcd8980c0c308d8 100644
--- a/exercises/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/exercise-fluidsystem/2pproblem.hh
@@ -91,16 +91,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
 private:
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>;
-    using WettingPhase = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
+    using LiquidWater = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
     /*!
      * Uncomment first line and comment second line for using the incompressible component
      * Uncomment second line and comment first line for using the compressible component
      */
-    using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
-    // using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
+    using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
+    // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
 
 public:
-    using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>;
+    using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
 };
 
 }
diff --git a/exercises/exercise-fluidsystem/README.md b/exercises/exercise-fluidsystem/README.md
index 612e88ec4a3d904c78ba4f493536925d8ebcdd53..2341e1cc568dc5c8fe6d5b2e39c8c6664f4193b4 100644
--- a/exercises/exercise-fluidsystem/README.md
+++ b/exercises/exercise-fluidsystem/README.md
@@ -92,16 +92,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
 private:
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>;
-    using WettingPhase = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
+    using LiquidWater = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
     /*!
      * Uncomment first line and comment second line for using the incompressible component
      * Uncomment second line and comment first line for using the compressible component
      */
-    using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
-    // using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
+    using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
+    // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
 
 public:
-    using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>;
+    using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
 };
 ```
 
diff --git a/exercises/solution/ex3/2pproblem.hh b/exercises/solution/ex3/2pproblem.hh
index 14b77500fb46ded66462c23daa682ad0a4d3cf7c..f5f14969505c7861640b2813b04936f5762e93dc 100644
--- a/exercises/solution/ex3/2pproblem.hh
+++ b/exercises/solution/ex3/2pproblem.hh
@@ -91,16 +91,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
 private:
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>;
-    using WettingPhase = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
+    using LiquidWater = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
     /*!
      * Uncomment first line and comment second line for using the incompressible component
      * Uncomment second line and comment first line for using the compressible component
      */
-    using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
-    // using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
+    using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
+    // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
 
 public:
-    using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>;
+    using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
 };
 
 }