From 02bb584fca9a054506b89c921b7289ab62d603bf Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 13 Aug 2013 14:16:05 +0100
Subject: [PATCH 1/7] ENH: tutorial updates

---
 .../verticalChannel/constant/reactingCloud1Properties          | 3 +--
 .../simplifiedSiwek/constant/coalCloud1Properties              | 3 +--
 .../hopper/hopperEmptying/constant/kinematicCloudProperties    | 2 ++
 .../hopperInitialState/constant/kinematicCloudProperties       | 2 ++
 .../cylinder/constant/reactingCloud1Properties                 | 2 --
 .../hotBoxes/constant/reactingCloud1Properties                 | 2 --
 .../splashPanel/constant/reactingCloud1Properties              | 2 --
 .../filter/constant/reactingCloud1Properties                   | 3 +--
 .../parcelInBox/constant/reactingCloud1Properties              | 3 +--
 .../verticalChannel/constant/reactingCloud1Properties          | 3 +--
 .../verticalChannel/constant/reactingCloud1Properties          | 3 +--
 .../sprayFoam/aachenBomb/constant/sprayCloudProperties         | 2 --
 12 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 6b759cd17e..689d846bac 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -70,9 +70,8 @@ constantProperties
     epsilon0        1;
     f0              0.5;
 
-    Tvap            273;
-    Tbp             373;
     Pr              0.7;
+    TDevol          273;
     LDevol          0;
     hRetentionCoeff 1;
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index 77742fd018..4f2f0020dc 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -65,8 +65,7 @@ constantProperties
     f0              0.5;
 
     Pr              0.7;
-    Tvap            400;
-    Tbp             400;
+    TDevol          400;
     LDevol          0;
     hRetentionCoeff 1;
 
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
index 159b737d17..06571ffdd1 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
@@ -68,6 +68,8 @@ subModels
 
     surfaceFilmModel none;
 
+    stochasticCollisionModel none;
+
     collisionModel pairCollision;
 
     pairCollisionCoeffs
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
index 49458393ea..874c386653 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
@@ -78,6 +78,8 @@ subModels
 
     surfaceFilmModel none;
 
+    stochasticCollisionModel none;
+
     collisionModel pairCollision;
 
     pairCollisionCoeffs
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
index b0104d35d2..041e9be531 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
@@ -63,8 +63,6 @@ constantProperties
     epsilon0        1;
     f0              0.5;
     Pr              0.7;
-    Tvap            273;
-    Tbp             373;
 
     constantVolume  false;
 }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
index fb559463aa..5cfe94ef37 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
@@ -63,8 +63,6 @@ constantProperties
     epsilon0        1;
     f0              0.5;
     Pr              0.7;
-    Tvap            273;
-    Tbp             373;
 
     constantVolume  false;
 }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
index 9c0d5fdcac..d334256506 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
@@ -63,8 +63,6 @@ constantProperties
     epsilon0        1;
     f0              0.5;
     Pr              0.7;
-    Tvap            273;
-    Tbp             373;
 
     constantVolume  false;
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
index 47aa8cf33c..4938ce4706 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -65,8 +65,7 @@ constantProperties
     f0              0.5;
 
     Pr              0.7;
-    Tvap            273;
-    Tbp             373;
+    TDevol          273;
     LDevol          0;
     hRetentionCoeff 1;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index 478bbe1359..f24057a445 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -64,9 +64,8 @@ constantProperties
     epsilon0        1;
     f0              0.5;
 
-    Tvap            284;
-    Tbp             373;
     Pr              0.7;
+    TDevol          284;
     LDevol          0;
     hRetentionCoeff 1;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 47cd1a3bb6..be1d4e5104 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -64,9 +64,8 @@ constantProperties
     epsilon0        1;
     f0              0.5;
 
-    Tvap            273;
-    Tbp             373;
     Pr              0.7;
+    TDevol          273;
     LDevol          0;
     hRetentionCoeff 1;
 
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 6b759cd17e..689d846bac 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -70,9 +70,8 @@ constantProperties
     epsilon0        1;
     f0              0.5;
 
-    Tvap            273;
-    Tbp             373;
     Pr              0.7;
+    TDevol          273;
     LDevol          0;
     hRetentionCoeff 1;
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
index a812560552..54f3e4dd33 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
@@ -68,8 +68,6 @@ constantProperties
     epsilon0        1;
     f0              0.5;
     Pr              0.7;
-    Tvap            273;
-    Tbp             373;
 
     constantVolume  false;
 }

From 6eca86fba538d4b4d2785f0eeaad3a3034972328 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 13 Aug 2013 15:12:05 +0100
Subject: [PATCH 2/7] ENH: SprayParcel - removed Tbp and Tvap

---
 .../spray/parcels/Templates/SprayParcel/SprayParcel.H       | 2 --
 .../spray/parcels/Templates/SprayParcel/SprayParcelI.H      | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
index 1ac1663d28..65a96036bc 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
@@ -110,8 +110,6 @@ public:
                 const scalar Pr,
                 const scalar pMin,
                 const Switch& constantVolume,
-                const scalar Tvap,
-                const scalar Tbp,
                 const scalar sigma0,
                 const scalar mu0
             );
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
index 66e5dc616f..76dad917b7 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
@@ -82,8 +82,6 @@ inline Foam::SprayParcel<ParcelType>::constantProperties::constantProperties
     const scalar Pr,
     const scalar pMin,
     const Switch& constantVolume,
-    const scalar Tvap,
-    const scalar Tbp,
     const scalar sigma0,
     const scalar mu0
 )
@@ -104,9 +102,7 @@ inline Foam::SprayParcel<ParcelType>::constantProperties::constantProperties
         f0,
         Pr,
         pMin,
-        constantVolume,
-        Tvap,
-        Tbp
+        constantVolume
     ),
     sigma0_(sigma0),
     mu0_(mu0)

From 208f63027d72533fb9f156ee3f34ac55e03135fc Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 13 Aug 2013 15:13:50 +0100
Subject: [PATCH 3/7] ENH: Refactored Kinematic cloud/parcels - torque, force
 and angularMomentum moved to Colliding level

---
 .../Templates/CollidingCloud/CollidingCloud.C | 14 +++-
 .../Templates/CollidingCloud/CollidingCloud.H | 15 +++-
 .../CollidingCloud/CollidingCloudI.H          | 20 +++++-
 .../Templates/KinematicCloud/KinematicCloud.C |  7 +-
 .../Templates/KinematicCloud/KinematicCloud.H |  3 -
 .../KinematicCloud/KinematicCloudI.H          | 18 -----
 .../kinematicCloud/kinematicCloud.H           |  2 +-
 .../CollidingParcel/CollidingParcel.C         | 29 ++++++++
 .../CollidingParcel/CollidingParcel.H         | 48 ++++++++++++-
 .../CollidingParcel/CollidingParcelI.H        | 60 ++++++++++++++--
 .../CollidingParcel/CollidingParcelIO.C       | 68 ++++++++++++++++++-
 .../KinematicParcel/KinematicParcel.C         | 14 +---
 .../KinematicParcel/KinematicParcel.H         | 38 -----------
 .../KinematicParcel/KinematicParcelI.H        | 61 -----------------
 .../KinematicParcel/KinematicParcelIO.C       | 44 +-----------
 15 files changed, 244 insertions(+), 197 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
index b368c44810..8292b9712b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -234,4 +234,16 @@ void  Foam::CollidingCloud<CloudType>::motion(TrackData& td)
 }
 
 
+template<class CloudType>
+void Foam::CollidingCloud<CloudType>::info()
+{
+    CloudType::info();
+
+    scalar rotationalKineticEnergy = rotationalKineticEnergyOfSystem();
+    reduce(rotationalKineticEnergy, sumOp<scalar>());
+
+    Info<< "    Rotational kinetic energy       = "
+        << rotationalKineticEnergy << nl;
+}
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
index c51e6a7bb5..3b42061bf4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,8 +197,13 @@ public:
                 inline CollisionModel<CollidingCloud<CloudType> >&
                     collision();
 
+        // Check
 
-        // Evolution
+            //- Total rotational kinetic energy in the system
+            inline scalar rotationalKineticEnergyOfSystem() const;
+
+
+        // Cloud evolution functions
 
             //- Store the current cloud state
             void storeState();
@@ -212,6 +217,12 @@ public:
             //- Particle motion
             template<class TrackData>
             void motion(TrackData& td);
+
+
+        // I-O
+
+            //- Print cloud information
+            void info();
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
index 19f03d39b1..1dedd5da9c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,4 +49,22 @@ Foam::CollidingCloud<CloudType>::collision()
 }
 
 
+template<class CloudType>
+inline Foam::scalar
+Foam::CollidingCloud<CloudType>::rotationalKineticEnergyOfSystem() const
+{
+    scalar rotationalKineticEnergy = 0.0;
+
+    forAllConstIter(typename CollidingCloud<CloudType>, *this, iter)
+    {
+        const parcelType& p = iter();
+
+        rotationalKineticEnergy +=
+            p.nParticle()*0.5*p.momentOfInertia()*(p.omega() & p.omega());
+    }
+
+    return rotationalKineticEnergy;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 445775a928..acf9e8c235 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -864,9 +864,6 @@ void Foam::KinematicCloud<CloudType>::info()
     scalar linearKineticEnergy = linearKineticEnergyOfSystem();
     reduce(linearKineticEnergy, sumOp<scalar>());
 
-    scalar rotationalKineticEnergy = rotationalKineticEnergyOfSystem();
-    reduce(rotationalKineticEnergy, sumOp<scalar>());
-
     Info<< "Cloud: " << this->name() << nl
         << "    Current number of parcels       = "
         << returnReduce(this->size(), sumOp<label>()) << nl
@@ -877,9 +874,7 @@ void Foam::KinematicCloud<CloudType>::info()
         << "   |Linear momentum|                = "
         << mag(linearMomentum) << nl
         << "    Linear kinetic energy           = "
-        << linearKineticEnergy << nl
-        << "    Rotational kinetic energy       = "
-        << rotationalKineticEnergy << nl;
+        << linearKineticEnergy << nl;
 
     injectors_.info(Info);
     this->surfaceFilm().info(Info);
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 59f9fc7da8..c29dfe2c8d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -487,9 +487,6 @@ public:
             //- Total linear kinetic energy in the system
             inline scalar linearKineticEnergyOfSystem() const;
 
-            //- Total rotational kinetic energy in the system
-            inline scalar rotationalKineticEnergyOfSystem() const;
-
             //- Penetration for fraction [0-1] of the current total mass
             inline scalar penetration(const scalar fraction) const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 5ba48458f2..5f0d6767f3 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -307,24 +307,6 @@ Foam::KinematicCloud<CloudType>::linearKineticEnergyOfSystem() const
 }
 
 
-template<class CloudType>
-inline Foam::scalar
-Foam::KinematicCloud<CloudType>::rotationalKineticEnergyOfSystem() const
-{
-    scalar rotationalKineticEnergy = 0.0;
-
-    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
-    {
-        const parcelType& p = iter();
-
-        rotationalKineticEnergy +=
-            p.nParticle()*0.5*p.momentOfInertia()*(p.omega() & p.omega());
-    }
-
-    return rotationalKineticEnergy;
-}
-
-
 template<class CloudType>
 inline Foam::scalar Foam::KinematicCloud<CloudType>::Dij
 (
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index 84a98dd6b7..07bcd970b0 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -86,7 +86,7 @@ public:
             virtual scalar linearKineticEnergyOfSystem() const = 0;
 
             //- Total rotational kinetic energy in the system
-            virtual scalar rotationalKineticEnergyOfSystem() const = 0;
+//            virtual scalar rotationalKineticEnergyOfSystem() const = 0;
 
             //- Penetration for percentage of the current total mass
 //            virtual scalar penetration(const scalar& fraction) const = 0;
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
index 97c531b21f..2e544b6906 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
@@ -34,6 +34,9 @@ Foam::CollidingParcel<ParcelType>::CollidingParcel
 )
 :
     ParcelType(p),
+    f_(p.f_),
+    angularMomentum_(p.angularMomentum_),
+    torque_(p.torque_),
     collisionRecords_(p.collisionRecords_)
 {}
 
@@ -46,6 +49,9 @@ Foam::CollidingParcel<ParcelType>::CollidingParcel
 )
 :
     ParcelType(p, mesh),
+    f_(p.f_),
+    angularMomentum_(p.angularMomentum_),
+    torque_(p.torque_),
     collisionRecords_(p.collisionRecords_)
 {}
 
@@ -166,6 +172,29 @@ bool Foam::CollidingParcel<ParcelType>::move
 }
 
 
+template<class ParcelType>
+void Foam::CollidingParcel<ParcelType>::transformProperties(const tensor& T)
+{
+    ParcelType::transformProperties(T);
+
+    f_ = transform(T, f_);
+
+    angularMomentum_ = transform(T, angularMomentum_);
+
+    torque_ = transform(T, torque_);
+}
+
+
+template<class ParcelType>
+void Foam::CollidingParcel<ParcelType>::transformProperties
+(
+    const vector& separation
+)
+{
+    ParcelType::transformProperties(separation);
+}
+
+
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
 #include "CollidingParcelIO.C"
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
index 5d6f6ca3e0..00cadb13ed 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ Ostream& operator<<
 );
 
 /*---------------------------------------------------------------------------*\
-                        Class CollidingParcel Declaration
+                       Class CollidingParcel Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ParcelType>
@@ -78,6 +78,16 @@ protected:
 
     // Protected data
 
+        //- Force on particle due to collisions [N]
+        vector f_;
+
+        //- Angular momentum of Parcel in global reference frame [kg m2/s]
+        vector angularMomentum_;
+
+        //- Torque on particle due to collisions in global
+        //  reference frame [Nm]
+        vector torque_;
+
         //- Particle collision records
         collisionRecordList collisionRecords_;
 
@@ -93,7 +103,10 @@ public:
         AddToPropertyList
         (
             ParcelType,
-            " collisionRecordsPairAccessed"
+            " (fx fy fz)"
+          + " (angularMomentumx angularMomentumy angularMomentumz)"
+          + " (torquex torquey torquez)"
+          + " collisionRecordsPairAccessed"
           + " collisionRecordsPairOrigProcOfOther"
           + " collisionRecordsPairOrigIdOfOther"
           + " (collisionRecordsPairData)"
@@ -188,12 +201,33 @@ public:
 
         // Access
 
+            //- Return const access to force
+            inline const vector& f() const;
+
+            //- Return const access to angular momentum
+            inline const vector& angularMomentum() const;
+
+            //- Return const access to torque
+            inline const vector& torque() const;
+
             //- Return const access to the collision records
             inline const collisionRecordList& collisionRecords() const;
 
+            //- Return access to force
+            inline vector& f();
+
+            //- Return access to angular momentum
+            inline vector& angularMomentum();
+
+            //- Return access to torque
+            inline vector& torque();
+
             //- Return access to collision records
             inline collisionRecordList& collisionRecords();
 
+            //- Particle angular velocity
+            inline vector omega() const;
+
 
         // Tracking
 
@@ -201,6 +235,14 @@ public:
             template<class TrackData>
             bool move(TrackData& td, const scalar trackTime);
 
+            //- Transform the physical properties of the particle
+            //  according to the given transformation tensor
+            virtual void transformProperties(const tensor& T);
+
+            //- Transform the physical properties of the particle
+            //  according to the given separation vector
+            virtual void transformProperties(const vector& separation);
+
 
        // I-O
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
index 908d9a30b5..cb8fb964fe 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,9 @@ inline Foam::CollidingParcel<ParcelType>::CollidingParcel
 )
 :
     ParcelType(owner, position, cellI, tetFaceI, tetPtI),
+    f_(vector::zero),
+    angularMomentum_(vector::zero),
+    torque_(vector::zero),
     collisionRecords_()
 {}
 
@@ -70,18 +73,39 @@ inline Foam::CollidingParcel<ParcelType>::CollidingParcel
         nParticle0,
         d0,
         dTarget0,
-        U0,
-        f0,
-        angularMomentum0,
         torque0,
         constProps
     ),
+    f_(f0),
+    angularMomentum_(angularMomentum0),
+    torque_(torque0),
     collisionRecords_()
 {}
 
 
 // * * * * * * * CollidingParcel Member Functions  * * * * * * * //
 
+template<class ParcelType>
+inline const Foam::vector& Foam::CollidingParcel<ParcelType>::f() const
+{
+    return f_;
+}
+
+
+template<class ParcelType>
+inline const Foam::vector&
+Foam::CollidingParcel<ParcelType>::angularMomentum() const
+{
+    return angularMomentum_;
+}
+
+
+template<class ParcelType>
+inline const Foam::vector& Foam::CollidingParcel<ParcelType>::torque() const
+{
+    return torque_;
+}
+
 
 template<class ParcelType>
 inline const Foam::collisionRecordList&
@@ -91,6 +115,27 @@ Foam::CollidingParcel<ParcelType>::collisionRecords() const
 }
 
 
+template<class ParcelType>
+inline Foam::vector& Foam::CollidingParcel<ParcelType>::f()
+{
+    return f_;
+}
+
+
+template<class ParcelType>
+inline Foam::vector& Foam::CollidingParcel<ParcelType>::angularMomentum()
+{
+    return angularMomentum_;
+}
+
+
+template<class ParcelType>
+inline Foam::vector& Foam::CollidingParcel<ParcelType>::torque()
+{
+    return torque_;
+}
+
+
 template<class ParcelType>
 inline Foam::collisionRecordList&
 Foam::CollidingParcel<ParcelType>::collisionRecords()
@@ -99,4 +144,11 @@ Foam::CollidingParcel<ParcelType>::collisionRecords()
 }
 
 
+template<class ParcelType>
+inline Foam::vector Foam::CollidingParcel<ParcelType>::omega() const
+{
+    return angularMomentum_/this->momentOfInertia();
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
index 90846259e8..020a663238 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,10 +45,30 @@ Foam::CollidingParcel<ParcelType>::CollidingParcel
 )
 :
     ParcelType(mesh, is, readFields),
+    f_(vector::zero),
+    angularMomentum_(vector::zero),
+    torque_(vector::zero),
     collisionRecords_()
 {
     if (readFields)
     {
+        if (is.format() == IOstream::ASCII)
+        {
+            is >> f_;
+            is >> angularMomentum_;
+            is >> torque_;
+        }
+        else
+        {
+            is.read
+            (
+                reinterpret_cast<char*>(&f_),
+              + sizeof(f_)
+              + sizeof(angularMomentum_)
+              + sizeof(torque_)
+            );
+        }
+
         is >> collisionRecords_;
     }
 
@@ -72,6 +92,18 @@ void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
 
     ParcelType::readFields(c);
 
+    IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, f);
+
+    IOField<vector> angularMomentum
+    (
+        c.fieldIOobject("angularMomentum", IOobject::MUST_READ)
+    );
+    c.checkFieldIOobject(c, angularMomentum);
+
+    IOField<vector> torque(c.fieldIOobject("torque", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, torque);
+
     labelFieldCompactIOField collisionRecordsPairAccessed
     (
         c.fieldIOobject("collisionRecordsPairAccessed", IOobject::MUST_READ)
@@ -128,6 +160,10 @@ void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
     {
         CollidingParcel<ParcelType>& p = iter();
 
+        p.f_ = f[i];
+        p.angularMomentum_ = angularMomentum[i];
+        p.torque_ = torque[i];
+
         p.collisionRecords_ = collisionRecordList
         (
             collisionRecordsPairAccessed[i],
@@ -152,6 +188,14 @@ void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
 
     label np =  c.size();
 
+    IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
+    IOField<vector> angularMomentum
+    (
+        c.fieldIOobject("angularMomentum", IOobject::NO_READ),
+        np
+    );
+    IOField<vector> torque(c.fieldIOobject("torque", IOobject::NO_READ), np);
+
     labelFieldCompactIOField collisionRecordsPairAccessed
     (
         c.fieldIOobject("collisionRecordsPairAccessed", IOobject::NO_READ),
@@ -198,6 +242,10 @@ void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
     {
         const CollidingParcel<ParcelType>& p = iter();
 
+        f[i] = p.f();
+        angularMomentum[i] = p.angularMomentum();
+        torque[i] = p.torque();
+
         collisionRecordsPairAccessed[i] = p.collisionRecords().pairAccessed();
         collisionRecordsPairOrigProcOfOther[i] =
             p.collisionRecords().pairOrigProcOfOther();
@@ -211,6 +259,10 @@ void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
         i++;
     }
 
+    f.write();
+    angularMomentum.write();
+    torque.write();
+
     collisionRecordsPairAccessed.write();
     collisionRecordsPairOrigProcOfOther.write();
     collisionRecordsPairOrigIdOfOther.write();
@@ -233,12 +285,22 @@ Foam::Ostream& Foam::operator<<
     if (os.format() == IOstream::ASCII)
     {
         os  << static_cast<const ParcelType&>(p)
+            << token::SPACE << p.f()
+            << token::SPACE << p.angularMomentum()
+            << token::SPACE << p.torque()
             << token::SPACE << p.collisionRecords();
     }
     else
     {
-        os  << static_cast<const ParcelType&>(p)
-            << p.collisionRecords();
+        os  << static_cast<const ParcelType&>(p);
+        os.write
+        (
+            reinterpret_cast<const char*>(&p.f_),
+          + sizeof(p.f())
+          + sizeof(p.angularMomentum())
+          + sizeof(p.torque())
+        );
+        os  << p.collisionRecords();
     }
 
     // Check state of Ostream
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 7ec52b1ee8..f866f69d85 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -213,9 +213,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(p.d_),
     dTarget_(p.dTarget_),
     U_(p.U_),
-    f_(p.f_),
-    angularMomentum_(p.angularMomentum_),
-    torque_(p.torque_),
     rho_(p.rho_),
     age_(p.age_),
     tTurb_(p.tTurb_),
@@ -240,9 +237,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(p.d_),
     dTarget_(p.dTarget_),
     U_(p.U_),
-    f_(p.f_),
-    angularMomentum_(p.angularMomentum_),
-    torque_(p.torque_),
     rho_(p.rho_),
     age_(p.age_),
     tTurb_(p.tTurb_),
@@ -437,12 +431,6 @@ void Foam::KinematicParcel<ParcelType>::transformProperties(const tensor& T)
     ParcelType::transformProperties(T);
 
     U_ = transform(T, U_);
-
-    f_ = transform(T, f_);
-
-    angularMomentum_ = transform(T, angularMomentum_);
-
-    torque_ = transform(T, torque_);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 3460fe401b..61ad57369e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -261,17 +261,6 @@ protected:
             //- Velocity of Parcel [m/s]
             vector U_;
 
-            //- Force on particle due to collisions [N]
-            vector f_;
-
-            //- Angular momentum of Parcel in global reference frame
-            // [kg m2/s]
-            vector angularMomentum_;
-
-            //- Torque on particle due to collisions in global
-            //  reference frame [Nm]
-            vector torque_;
-
             //- Density [kg/m3]
             scalar rho_;
 
@@ -332,9 +321,6 @@ public:
           + " d"
           + " dTarget "
           + " (Ux Uy Uz)"
-          + " (fx fy fz)"
-          + " (angularMomentumx angularMomentumy angularMomentumz)"
-          + " (torquex torquey torquez)"
           + " rho"
           + " age"
           + " tTurb"
@@ -367,9 +353,6 @@ public:
             const scalar nParticle0,
             const scalar d0,
             const scalar dTarget0,
-            const vector& U0,
-            const vector& f0,
-            const vector& angularMomentum0,
             const vector& torque0,
             const constantProperties& constProps
         );
@@ -445,15 +428,6 @@ public:
             //- Return const access to velocity
             inline const vector& U() const;
 
-            //- Return const access to force
-            inline const vector& f() const;
-
-            //- Return const access to angular momentum
-            inline const vector& angularMomentum() const;
-
-            //- Return const access to torque
-            inline const vector& torque() const;
-
             //- Return const access to density
             inline scalar rho() const;
 
@@ -496,15 +470,6 @@ public:
             //- Return access to velocity
             inline vector& U();
 
-            //- Return access to force
-            inline vector& f();
-
-            //- Return access to angular momentum
-            inline vector& angularMomentum();
-
-            //- Return access to torque
-            inline vector& torque();
-
             //- Return access to density
             inline scalar& rho();
 
@@ -532,9 +497,6 @@ public:
             //- Particle moment of inertia around diameter axis
             inline scalar momentOfInertia() const;
 
-            //- Particle angular velocity
-            inline vector omega() const;
-
             //- Particle volume
             inline scalar volume() const;
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 6956a8b74c..6e336a0d6a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -135,9 +135,6 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(0.0),
     dTarget_(0.0),
     U_(vector::zero),
-    f_(vector::zero),
-    angularMomentum_(vector::zero),
-    torque_(vector::zero),
     rho_(0.0),
     age_(0.0),
     tTurb_(0.0),
@@ -161,9 +158,6 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     const scalar d0,
     const scalar dTarget0,
     const vector& U0,
-    const vector& f0,
-    const vector& angularMomentum0,
-    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -174,9 +168,6 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(d0),
     dTarget_(dTarget0),
     U_(U0),
-    f_(f0),
-    angularMomentum_(angularMomentum0),
-    torque_(torque0),
     rho_(constProps.rho0()),
     age_(0.0),
     tTurb_(0.0),
@@ -289,30 +280,6 @@ inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
 }
 
 
-template<class ParcelType>
-inline const Foam::vector&
-Foam::KinematicParcel<ParcelType>::f() const
-{
-    return f_;
-}
-
-
-template<class ParcelType>
-inline const Foam::vector&
-Foam::KinematicParcel<ParcelType>::angularMomentum() const
-{
-    return angularMomentum_;
-}
-
-
-template<class ParcelType>
-inline const Foam::vector&
-Foam::KinematicParcel<ParcelType>::torque() const
-{
-    return torque_;
-}
-
-
 template<class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
 {
@@ -404,27 +371,6 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
 }
 
 
-template<class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::f()
-{
-    return f_;
-}
-
-
-template<class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::angularMomentum()
-{
-    return angularMomentum_;
-}
-
-
-template<class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::torque()
-{
-    return torque_;
-}
-
-
 template<class ParcelType>
 inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
 {
@@ -492,13 +438,6 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::momentOfInertia() const
 }
 
 
-template<class ParcelType>
-inline Foam::vector Foam::KinematicParcel<ParcelType>::omega() const
-{
-    return angularMomentum_/momentOfInertia();
-}
-
-
 template<class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
 {
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 6dee6a42be..281cf4ef95 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,9 +51,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(0.0),
     dTarget_(0.0),
     U_(vector::zero),
-    f_(vector::zero),
-    angularMomentum_(vector::zero),
-    torque_(vector::zero),
     rho_(0.0),
     age_(0.0),
     tTurb_(0.0),
@@ -72,9 +69,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
             d_ = readScalar(is);
             dTarget_ = readScalar(is);
             is >> U_;
-            is >> f_;
-            is >> angularMomentum_;
-            is >> torque_;
             rho_ = readScalar(is);
             age_ = readScalar(is);
             tTurb_ = readScalar(is);
@@ -91,9 +85,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
               + sizeof(d_)
               + sizeof(dTarget_)
               + sizeof(U_)
-              + sizeof(f_)
-              + sizeof(angularMomentum_)
-              + sizeof(torque_)
               + sizeof(rho_)
               + sizeof(age_)
               + sizeof(tTurb_)
@@ -141,18 +132,6 @@ void Foam::KinematicParcel<ParcelType>::readFields(CloudType& c)
     IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
     c.checkFieldIOobject(c, U);
 
-    IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ));
-    c.checkFieldIOobject(c, f);
-
-    IOField<vector> angularMomentum
-    (
-        c.fieldIOobject("angularMomentum", IOobject::MUST_READ)
-    );
-    c.checkFieldIOobject(c, angularMomentum);
-
-    IOField<vector> torque(c.fieldIOobject("torque", IOobject::MUST_READ));
-    c.checkFieldIOobject(c, torque);
-
     IOField<scalar> rho(c.fieldIOobject("rho", IOobject::MUST_READ));
     c.checkFieldIOobject(c, rho);
 
@@ -177,8 +156,6 @@ void Foam::KinematicParcel<ParcelType>::readFields(CloudType& c)
         p.d_ = d[i];
         p.dTarget_ = dTarget[i];
         p.U_ = U[i];
-        p.f_ = f[i];
-        p.angularMomentum_ = angularMomentum[i];
         p.rho_ = rho[i];
         p.age_ = age[i];
         p.tTurb_ = tTurb[i];
@@ -207,13 +184,6 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
     IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
     IOField<scalar> dTarget(c.fieldIOobject("dTarget", IOobject::NO_READ), np);
     IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
-    IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
-    IOField<vector> angularMomentum
-    (
-        c.fieldIOobject("angularMomentum", IOobject::NO_READ),
-        np
-    );
-    IOField<vector> torque(c.fieldIOobject("torque", IOobject::NO_READ), np);
     IOField<scalar> rho(c.fieldIOobject("rho", IOobject::NO_READ), np);
     IOField<scalar> age(c.fieldIOobject("age", IOobject::NO_READ), np);
     IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
@@ -231,9 +201,6 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
         d[i] = p.d();
         dTarget[i] = p.dTarget();
         U[i] = p.U();
-        f[i] = p.f();
-        angularMomentum[i] = p.angularMomentum();
-        torque[i] = p.torque();
         rho[i] = p.rho();
         age[i] = p.age();
         tTurb[i] = p.tTurb();
@@ -248,9 +215,6 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
     d.write();
     dTarget.write();
     U.write();
-    f.write();
-    angularMomentum.write();
-    torque.write();
     rho.write();
     age.write();
     tTurb.write();
@@ -276,9 +240,6 @@ Foam::Ostream& Foam::operator<<
             << token::SPACE << p.d()
             << token::SPACE << p.dTarget()
             << token::SPACE << p.U()
-            << token::SPACE << p.f()
-            << token::SPACE << p.angularMomentum()
-            << token::SPACE << p.torque()
             << token::SPACE << p.rho()
             << token::SPACE << p.age()
             << token::SPACE << p.tTurb()
@@ -296,9 +257,6 @@ Foam::Ostream& Foam::operator<<
           + sizeof(p.d())
           + sizeof(p.dTarget())
           + sizeof(p.U())
-          + sizeof(p.f())
-          + sizeof(p.angularMomentum())
-          + sizeof(p.torque())
           + sizeof(p.rho())
           + sizeof(p.age())
           + sizeof(p.tTurb())

From 2780df8365be3052ed72d388ffc7b61eca9ddcd6 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 13 Aug 2013 23:21:46 +0100
Subject: [PATCH 4/7] multiphase: Update phase-naming to use the new convention
 e.g. alpha.water

---
 .../multiphase/cavitatingFoam/alphavPsi.H     |  11 ++++
 .../cavitatingFoam/cavitatingFoam.C           |   2 +-
 .../cavitatingFoam/continuityErrs.H           |   2 +-
 .../multiphase/cavitatingFoam/createFields.H  |  14 ++---
 .../multiphase/cavitatingFoam/gammaPsi.H      |  11 ----
 .../solvers/multiphase/cavitatingFoam/pEqn.H  |  16 +++---
 .../twoPhaseMixtureThermo.C                   |   4 +-
 .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.C   |   5 +-
 .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.H   |   3 +-
 .../Merkle/Merkle.C                           |   5 +-
 .../Merkle/Merkle.H                           |   3 +-
 .../SchnerrSauer/SchnerrSauer.C               |   5 +-
 .../SchnerrSauer/SchnerrSauer.H               |   3 +-
 .../newPhaseChangeTwoPhaseMixture.C           |   5 +-
 .../phaseChangeTwoPhaseMixture.C              |   5 +-
 .../phaseChangeTwoPhaseMixture.H              |  11 ++--
 .../multiphase/twoLiquidMixingFoam/alphaEqn.H |   2 +-
 ...tFlowRateInletVelocityFvPatchVectorField.C |  19 ++++---
 ...tFlowRateInletVelocityFvPatchVectorField.H |   5 ++
 .../incompressibleTwoPhaseMixture.C           |  10 ++--
 .../incompressibleTwoPhaseMixture.H           |   4 +-
 .../twoPhaseMixture/twoPhaseMixture.C         |  22 ++------
 .../twoPhaseMixture/twoPhaseMixture.H         |   4 +-
 .../0/{alpha1.org => alpha.water.org}         |   0
 .../LTSInterFoam/wigleyHull/Allclean          |   2 +-
 .../multiphase/LTSInterFoam/wigleyHull/Allrun |   2 +-
 .../wigleyHull/constant/transportProperties   |   6 ++-
 .../LTSInterFoam/wigleyHull/system/fvSchemes  |   2 +-
 .../LTSInterFoam/wigleyHull/system/fvSolution |   2 +-
 .../wigleyHull/system/setFieldsDict           |   4 +-
 .../mixerVessel2D/0/{alpha1 => alpha.water}   |   2 +-
 .../0/{alpha1.org => alpha.water.org}         |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../mixerVessel2D/system/fvSchemes            |   2 +-
 .../mixerVessel2D/system/fvSolution           |   2 +-
 .../mixerVessel2D/system/setFieldsDict        |   4 +-
 .../0/gamma => les/throttle/0/alpha.vapour}   |   2 +-
 .../les/throttle/constant/transportProperties |  11 ++--
 .../les/throttle/system/controlDict           |   2 +-
 .../throttle3D/0.org/{gamma => alpha.vapour}  |   2 +-
 .../cavitatingFoam/les/throttle3D/0/U         |  48 -----------------
 .../cavitatingFoam/les/throttle3D/0/gamma     |  48 -----------------
 .../cavitatingFoam/les/throttle3D/0/k         |  47 ----------------
 .../cavitatingFoam/les/throttle3D/0/nuSgs     |  47 ----------------
 .../cavitatingFoam/les/throttle3D/0/p         |  51 ------------------
 .../cavitatingFoam/les/throttle3D/0/rho       |  46 ----------------
 .../cavitatingFoam/les/throttle3D/Allclean    |   1 -
 .../throttle3D/constant/transportProperties   |  11 ++--
 .../les/throttle3D/system/controlDict         |   2 +-
 .../0/gamma => ras/throttle/0/alpha.vapour}   |   2 +-
 .../ras/throttle/constant/transportProperties |  11 ++--
 .../0/alpha.water.org}                        |   2 +-
 .../laminar/depthCharge2D/Allclean            |   2 +-
 .../laminar/depthCharge2D/Allrun              |   2 +-
 ...ertiesair => thermophysicalProperties.air} |   0
 ...eswater => thermophysicalProperties.water} |   0
 .../laminar/depthCharge2D/system/fvSchemes    |   4 +-
 .../laminar/depthCharge2D/system/fvSolution   |   2 +-
 .../depthCharge2D/system/setFieldsDict        |   6 +--
 .../laminar/depthCharge3D/0/T.air.gz          | Bin 0 -> 5080 bytes
 .../laminar/depthCharge3D/0/T.water.gz        | Bin 0 -> 5082 bytes
 .../0/alpha.water.org}                        |   0
 .../laminar/depthCharge3D/Allclean            |   2 +-
 .../laminar/depthCharge3D/Allrun              |   2 +-
 ...ertiesair => thermophysicalProperties.air} |   0
 ...eswater => thermophysicalProperties.water} |   0
 .../laminar/depthCharge3D/system/fvSchemes    |   4 +-
 .../laminar/depthCharge3D/system/fvSolution   |   2 +-
 .../depthCharge3D/system/setFieldsDict        |   6 +--
 .../0.org/{alpha1.org => alpha.water}         |   2 +-
 .../0.org/{alpha1 => alpha.water.org}         |   2 +-
 .../constant/dynamicMeshDict                  |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../damBreakWithObstacle/system/fvSolution    |   2 +-
 .../damBreakWithObstacle/system/setFieldsDict |   4 +-
 .../0.org/{alpha1 => alpha.water}             |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../ras/floatingObject/system/fvSolution      |   2 +-
 .../ras/floatingObject/system/setFieldsDict   |   6 +--
 .../0.org/{alpha1 => alpha.water}             |   2 +-
 .../constant/transportProperties              |  11 ++--
 .../ras/mixerVesselAMI/system/fvSolution      |   2 +-
 .../ras/mixerVesselAMI/system/setFieldsDict   |   4 +-
 .../0/{alpha1.org => alpha.water.org}         |   2 +-
 .../interDyMFoam/ras/sloshingTank2D/Allclean  |   2 +-
 .../interDyMFoam/ras/sloshingTank2D/Allrun    |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../ras/sloshingTank2D/system/fvSolution      |   2 +-
 .../ras/sloshingTank2D/system/setFieldsDict   |   4 +-
 .../0/{alpha1.org => alpha.water.org}         |   2 +-
 .../ras/sloshingTank2D3DoF/Allclean           |   2 +-
 .../ras/sloshingTank2D3DoF/Allrun             |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../ras/sloshingTank2D3DoF/system/fvSolution  |   2 +-
 .../sloshingTank2D3DoF/system/setFieldsDict   |   4 +-
 .../0/alpha.water.org}                        |   2 +-
 .../interDyMFoam/ras/sloshingTank3D/Allclean  |   2 +-
 .../interDyMFoam/ras/sloshingTank3D/Allrun    |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../ras/sloshingTank3D/system/fvSolution      |   2 +-
 .../ras/sloshingTank3D/system/setFieldsDict   |   4 +-
 .../0/{alpha1.org => alpha.water.org}         |   2 +-
 .../ras/sloshingTank3D3DoF/Allclean           |   2 +-
 .../ras/sloshingTank3D3DoF/Allrun             |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../ras/sloshingTank3D3DoF/system/fvSolution  |   2 +-
 .../sloshingTank3D3DoF/system/setFieldsDict   |   4 +-
 .../0/alpha.water.org}                        |   2 +-
 .../ras/sloshingTank3D6DoF/Allclean           |   2 +-
 .../ras/sloshingTank3D6DoF/Allrun             |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../ras/sloshingTank3D6DoF/system/fvSolution  |   2 +-
 .../sloshingTank3D6DoF/system/setFieldsDict   |   4 +-
 .../0/alpha.water.org}                        |   2 +-
 .../interDyMFoam/ras/testTubeMixer/Allclean   |   2 +-
 .../interDyMFoam/ras/testTubeMixer/Allrun     |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../ras/testTubeMixer/system/fvSolution       |   2 +-
 .../ras/testTubeMixer/system/setFieldsDict    |   4 +-
 .../multiphase/interFoam/laminar/Allclean     |   2 +-
 tutorials/multiphase/interFoam/laminar/Allrun |   6 +--
 .../0/{alpha1.org => alpha.water.org}         |   0
 .../constant/transportProperties              |   6 ++-
 .../laminar/capillaryRise/system/fvSchemes    |   2 +-
 .../laminar/capillaryRise/system/fvSolution   |   2 +-
 .../capillaryRise/system/setFieldsDict        |   4 +-
 .../damBreak/0/alpha.water.org}               |   2 +-
 .../damBreak/constant/transportProperties     |   6 ++-
 .../laminar/damBreak/system/fvSchemes         |   2 +-
 .../laminar/damBreak/system/fvSolution        |   2 +-
 .../laminar/damBreak/system/setFieldsDict     |   4 +-
 .../les/nozzleFlow2D/0/{alpha1 => alpha.fuel} |   2 +-
 .../nozzleFlow2D/constant/transportProperties |  11 ++--
 .../les/nozzleFlow2D/system/fvSolution        |   2 +-
 tutorials/multiphase/interFoam/ras/Allclean   |   4 +-
 tutorials/multiphase/interFoam/ras/Allrun     |   5 +-
 .../ras/damBreak/0/{alpha1 => alpha.water}    |   2 +-
 .../damBreak/0/alpha.water.org}               |   2 +-
 .../ras/damBreak/constant/transportProperties |  11 ++--
 .../interFoam/ras/damBreak/system/fvSolution  |   2 +-
 .../ras/damBreak/system/setFieldsDict         |   4 +-
 .../0/{alpha1 => alpha.water}                 |   2 +-
 .../0/{alpha1.org => alpha.water.org}         |   2 +-
 .../ras/damBreakPorousBaffle/0/epsilon        |   3 ++
 .../ras/damBreakPorousBaffle/0/p_rgh          |   3 ++
 .../constant/transportProperties              |  11 ++--
 .../damBreakPorousBaffle/system/fvSolution    |   2 +-
 .../damBreakPorousBaffle/system/setFieldsDict |   4 +-
 .../0/{alpha1.org => alpha.water.org}         |   0
 .../interFoam/ras/waterChannel/Allclean       |   2 +-
 .../interFoam/ras/waterChannel/Allrun         |   2 +-
 .../LTSInterFoam/system/fvSchemes             |   2 +-
 .../LTSInterFoam/system/fvSolution            |   2 +-
 .../LTSInterFoam/system/setFieldsDict         |   6 +--
 .../waterChannel/constant/transportProperties |   6 ++-
 .../ras/waterChannel/system/fvSchemes         |   2 +-
 .../ras/waterChannel/system/fvSolution        |   2 +-
 .../ras/waterChannel/system/setFieldsDict     |   4 +-
 .../interFoam/ras/weirOverflow/0.org/U        |   1 +
 .../0.org/{alpha1.org => alpha.water.org}     |   2 +-
 .../interFoam/ras/weirOverflow/Allrun         |   2 +-
 .../weirOverflow/constant/transportProperties |  11 ++--
 .../ras/weirOverflow/system/fvSolution        |   2 +-
 .../ras/weirOverflow/system/setFieldsDict     |   4 +-
 .../propeller/0.org/{alpha1 => alpha.water}   |   2 +-
 .../propeller/constant/transportProperties    |   6 ++-
 .../propeller/system/fvSchemes                |   2 +-
 .../propeller/system/fvSolution               |   2 +-
 .../0/{alpha1 => alpha.water}                 |   2 +-
 .../constant/transportProperties              |   6 ++-
 .../cavitatingBullet/system/fvSchemes         |   2 +-
 .../cavitatingBullet/system/fvSolution        |   2 +-
 .../0.org/{alpha1 => alpha.sludge}            |   2 +-
 .../lockExchange/constant/transportProperties |   6 ++-
 .../lockExchange/system/fvSchemes             |   4 +-
 .../lockExchange/system/fvSolution            |   2 +-
 .../lockExchange/system/setFieldsDict         |   4 +-
 177 files changed, 313 insertions(+), 622 deletions(-)
 create mode 100644 applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
 delete mode 100644 applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
 rename tutorials/multiphase/LTSInterFoam/wigleyHull/0/{alpha1.org => alpha.water.org} (100%)
 rename tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/{alpha1 => alpha.water} (99%)
 rename tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/{alpha1.org => alpha.water.org} (97%)
 rename tutorials/multiphase/cavitatingFoam/{ras/throttle/0/gamma => les/throttle/0/alpha.vapour} (97%)
 rename tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/{gamma => alpha.vapour} (97%)
 delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
 delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
 delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
 delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
 delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
 delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
 rename tutorials/multiphase/cavitatingFoam/{les/throttle/0/gamma => ras/throttle/0/alpha.vapour} (97%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/{depthCharge3D/0/alphawater.org => depthCharge2D/0/alpha.water.org} (97%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/{thermophysicalPropertiesair => thermophysicalProperties.air} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/{thermophysicalPropertieswater => thermophysicalProperties.water} (100%)
 create mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz
 create mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz
 rename tutorials/multiphase/compressibleInterFoam/laminar/{depthCharge2D/0/alphawater.org => depthCharge3D/0/alpha.water.org} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/{thermophysicalPropertiesair => thermophysicalProperties.air} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/{thermophysicalPropertieswater => thermophysicalProperties.water} (100%)
 rename tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/{alpha1.org => alpha.water} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/{alpha1 => alpha.water.org} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/{alpha1 => alpha.water} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/{alpha1 => alpha.water} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/{alpha1.org => alpha.water.org} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/{alpha1.org => alpha.water.org} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/{testTubeMixer/0/alpha1.org => sloshingTank3D/0/alpha.water.org} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/{alpha1.org => alpha.water.org} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/{sloshingTank3D/0/alpha1.org => sloshingTank3D6DoF/0/alpha.water.org} (97%)
 rename tutorials/multiphase/interDyMFoam/ras/{sloshingTank3D6DoF/0/alpha1.org => testTubeMixer/0/alpha.water.org} (97%)
 rename tutorials/multiphase/interFoam/laminar/capillaryRise/0/{alpha1.org => alpha.water.org} (100%)
 rename tutorials/multiphase/interFoam/{ras/damBreak/0/alpha1.org => laminar/damBreak/0/alpha.water.org} (97%)
 rename tutorials/multiphase/interFoam/les/nozzleFlow2D/0/{alpha1 => alpha.fuel} (97%)
 rename tutorials/multiphase/interFoam/ras/damBreak/0/{alpha1 => alpha.water} (97%)
 rename tutorials/multiphase/interFoam/{laminar/damBreak/0/alpha1.org => ras/damBreak/0/alpha.water.org} (97%)
 rename tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/{alpha1 => alpha.water} (97%)
 rename tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/{alpha1.org => alpha.water.org} (97%)
 rename tutorials/multiphase/interFoam/ras/waterChannel/0/{alpha1.org => alpha.water.org} (100%)
 rename tutorials/multiphase/interFoam/ras/weirOverflow/0.org/{alpha1.org => alpha.water.org} (98%)
 rename tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/{alpha1 => alpha.water} (97%)
 rename tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/{alpha1 => alpha.water} (97%)
 rename tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/{alpha1 => alpha.sludge} (97%)

diff --git a/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
new file mode 100644
index 0000000000..e988d30737
--- /dev/null
+++ b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
@@ -0,0 +1,11 @@
+{
+    alphav = max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0));
+    alphal = 1.0 - alphav;
+
+    Info<< "max-min alphav: " << max(alphav).value()
+        << " " << min(alphav).value() << endl;
+
+    psiModel->correct();
+
+    //Info<< "min a: " << 1.0/sqrt(max(psi)).value() << endl;
+}
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 73e9577029..c4453df391 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
         while (pimple.loop())
         {
             #include "rhoEqn.H"
-            #include "gammaPsi.H"
+            #include "alphavPsi.H"
             #include "UEqn.H"
 
             // --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
index ce618ee40f..14b0ef7786 100644
--- a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
+++ b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
@@ -1,5 +1,5 @@
 {
-    volScalarField thermoRho = psi*p + gamma2*rhol0;
+    volScalarField thermoRho = psi*p + alphal*rhol0;
 
     dimensionedScalar totalMass = fvc::domainIntegrate(rho);
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H
index 8958dc3c5e..605c0deece 100644
--- a/applications/solvers/multiphase/cavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -44,19 +44,19 @@
 
     Info<< "Reading transportProperties\n" << endl;
 
-    incompressibleTwoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
+    incompressibleTwoPhaseMixture twoPhaseProperties(U, phiv);
 
-    volScalarField& gamma(twoPhaseProperties.alpha1());
-    gamma.oldTime();
+    volScalarField& alphav(twoPhaseProperties.alpha1());
+    alphav.oldTime();
 
-    volScalarField& gamma2(twoPhaseProperties.alpha2());
+    volScalarField& alphal(twoPhaseProperties.alpha2());
 
     Info<< "Creating compressibilityModel\n" << endl;
     autoPtr<barotropicCompressibilityModel> psiModel =
         barotropicCompressibilityModel::New
         (
             thermodynamicProperties,
-            gamma
+            alphav
         );
 
     const volScalarField& psi = psiModel->psi();
@@ -64,8 +64,8 @@
     rho == max
     (
         psi*p
-      + gamma2*rhol0
-      + ((gamma*psiv + gamma2*psil) - psi)*pSat,
+      + alphal*rhol0
+      + ((alphav*psiv + alphal*psil) - psi)*pSat,
         rhoMin
     );
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/gammaPsi.H b/applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
deleted file mode 100644
index 4edda7336d..0000000000
--- a/applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    gamma = max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0));
-    gamma2 = 1.0 - gamma;
-
-    Info<< "max-min gamma: " << max(gamma).value()
-        << " " << min(gamma).value() << endl;
-
-    psiModel->correct();
-
-    //Info<< "min a: " << 1.0/sqrt(max(psi)).value() << endl;
-}
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index b2c7d953b5..da43e67ce7 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -4,8 +4,8 @@
         p =
         (
             rho
-          - gamma2*rhol0
-          - ((gamma*psiv + gamma2*psil) - psi)*pSat
+          - alphal*rhol0
+          - ((alphav*psiv + alphal*psil) - psi)*pSat
         )/psi;
     }
 
@@ -29,7 +29,7 @@
         fvScalarMatrix pEqn
         (
             fvm::ddt(psi, p)
-          - (rhol0 + (psil - psiv)*pSat)*fvc::ddt(gamma) - pSat*fvc::ddt(psi)
+          - (rhol0 + (psil - psiv)*pSat)*fvc::ddt(alphav) - pSat*fvc::ddt(psi)
           + fvc::div(phiv, rho)
           + fvc::div(phiGradp)
           - fvm::laplacian(rAUf, p)
@@ -49,18 +49,18 @@
     rho == max
     (
         psi*p
-      + gamma2*rhol0
-      + ((gamma*psiv + gamma2*psil) - psi)*pSat,
+      + alphal*rhol0
+      + ((alphav*psiv + alphal*psil) - psi)*pSat,
         rhoMin
     );
 
-    #include "gammaPsi.H"
+    #include "alphavPsi.H"
 
     p =
     (
         rho
-      - gamma2*rhol0
-      - ((gamma*psiv + gamma2*psil) - psi)*pSat
+      - alphal*rhol0
+      - ((alphav*psiv + alphal*psil) - psi)*pSat
     )/psi;
 
     p.correctBoundaryConditions();
diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
index d81f5ccb1f..e9c5322c79 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
@@ -49,12 +49,12 @@ Foam::twoPhaseMixtureThermo::twoPhaseMixtureThermo
     thermo2_(NULL)
 {
     {
-        volScalarField T1("T" + phase1Name(), T_);
+        volScalarField T1(IOobject::groupName("T", phase1Name()), T_);
         T1.write();
     }
 
     {
-        volScalarField T2("T" + phase2Name(), T_);
+        volScalarField T2(IOobject::groupName("T", phase2Name()), T_);
         T2.write();
     }
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
index 0e9e8ae349..f7cc2eae21 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
@@ -42,11 +42,10 @@ namespace phaseChangeTwoPhaseMixtures
 Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz
 (
     const volVectorField& U,
-    const surfaceScalarField& phi,
-    const word& alpha1Name
+    const surfaceScalarField& phi
 )
 :
-    phaseChangeTwoPhaseMixture(typeName, U, phi, alpha1Name),
+    phaseChangeTwoPhaseMixture(typeName, U, phi),
 
     UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")),
     tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
index 39ccad5382..f0290efc95 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
@@ -91,8 +91,7 @@ public:
         Kunz
         (
             const volVectorField& U,
-            const surfaceScalarField& phi,
-            const word& alpha1Name = "alpha1"
+            const surfaceScalarField& phi
         );
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
index 87c261da9b..72fdb7245e 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
@@ -42,11 +42,10 @@ namespace phaseChangeTwoPhaseMixtures
 Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle
 (
     const volVectorField& U,
-    const surfaceScalarField& phi,
-    const word& alpha1Name
+    const surfaceScalarField& phi
 )
 :
-    phaseChangeTwoPhaseMixture(typeName, U, phi, alpha1Name),
+    phaseChangeTwoPhaseMixture(typeName, U, phi),
 
     UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")),
     tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
index 7dd8e841c8..e675c83df7 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
@@ -85,8 +85,7 @@ public:
         Merkle
         (
             const volVectorField& U,
-            const surfaceScalarField& phi,
-            const word& alpha1Name = "alpha1"
+            const surfaceScalarField& phi
         );
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
index 36cb56a0c2..f157fa75e0 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
@@ -49,11 +49,10 @@ namespace phaseChangeTwoPhaseMixtures
 Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::SchnerrSauer
 (
     const volVectorField& U,
-    const surfaceScalarField& phi,
-    const word& alpha1Name
+    const surfaceScalarField& phi
 )
 :
-    phaseChangeTwoPhaseMixture(typeName, U, phi, alpha1Name),
+    phaseChangeTwoPhaseMixture(typeName, U, phi),
 
     n_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("n")),
     dNuc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("dNuc")),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
index beef7fc7fc..ce096105d9 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
@@ -98,8 +98,7 @@ public:
         SchnerrSauer
         (
             const volVectorField& U,
-            const surfaceScalarField& phi,
-            const word& alpha1Name = "alpha1"
+            const surfaceScalarField& phi
         );
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
index 08728c8f92..0a86459705 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
@@ -32,8 +32,7 @@ Foam::autoPtr<Foam::phaseChangeTwoPhaseMixture>
 Foam::phaseChangeTwoPhaseMixture::New
 (
     const volVectorField& U,
-    const surfaceScalarField& phi,
-    const word& alpha1Name
+    const surfaceScalarField& phi
 )
 {
     IOdictionary transportPropertiesDict
@@ -73,7 +72,7 @@ Foam::phaseChangeTwoPhaseMixture::New
             << exit(FatalError);
     }
 
-    return autoPtr<phaseChangeTwoPhaseMixture>(cstrIter()(U, phi, alpha1Name));
+    return autoPtr<phaseChangeTwoPhaseMixture>(cstrIter()(U, phi));
 }
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
index c08eba9390..d25fbdfec9 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
@@ -39,11 +39,10 @@ Foam::phaseChangeTwoPhaseMixture::phaseChangeTwoPhaseMixture
 (
     const word& type,
     const volVectorField& U,
-    const surfaceScalarField& phi,
-    const word& alpha1Name
+    const surfaceScalarField& phi
 )
 :
-    incompressibleTwoPhaseMixture(U, phi, alpha1Name),
+    incompressibleTwoPhaseMixture(U, phi),
     phaseChangeTwoPhaseMixtureCoeffs_(subDict(type + "Coeffs")),
     pSat_(lookup("pSat"))
 {}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
index e05476390b..227768ac8d 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
@@ -91,10 +91,9 @@ public:
             components,
             (
                 const volVectorField& U,
-                const surfaceScalarField& phi,
-                const word& alpha1Name
+                const surfaceScalarField& phi
             ),
-            (U, phi, alpha1Name)
+            (U, phi)
         );
 
 
@@ -104,8 +103,7 @@ public:
         static autoPtr<phaseChangeTwoPhaseMixture> New
         (
             const volVectorField& U,
-            const surfaceScalarField& phi,
-            const word& alpha1Name = "alpha1"
+            const surfaceScalarField& phi
         );
 
 
@@ -116,8 +114,7 @@ public:
         (
             const word& type,
             const volVectorField& U,
-            const surfaceScalarField& phi,
-            const word& alpha1Name = "alpha1"
+            const surfaceScalarField& phi
         );
 
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
index c68a0e56c5..adca48e965 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
@@ -1,5 +1,5 @@
 {
-    word alphaScheme("div(phi,alpha1)");
+    word alphaScheme("div(phi,alpha)");
 
     surfaceScalarField phiAlpha
     (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 72af0d8d9c..1fcc5feb7d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -39,7 +39,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    flowRate_(0)
+    flowRate_(0),
+    alphaName_("none")
 {}
 
 
@@ -53,7 +54,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    flowRate_(ptf.flowRate_)
+    flowRate_(ptf.flowRate_),
+    alphaName_(ptf.alphaName_)
 {}
 
 
@@ -66,7 +68,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict),
-    flowRate_(readScalar(dict.lookup("flowRate")))
+    flowRate_(readScalar(dict.lookup("flowRate"))),
+    alphaName_(dict.lookup("alpha"))
 {}
 
 
@@ -77,7 +80,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf),
-    flowRate_(ptf.flowRate_)
+    flowRate_(ptf.flowRate_),
+    alphaName_(ptf.alphaName_)
 {}
 
 
@@ -89,7 +93,8 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, iF),
-    flowRate_(ptf.flowRate_)
+    flowRate_(ptf.flowRate_),
+    alphaName_(ptf.alphaName_)
 {}
 
 
@@ -104,7 +109,7 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
     }
 
     scalarField alphap =
-        patch().lookupPatchField<volScalarField, scalar>("alpha1");
+        patch().lookupPatchField<volScalarField, scalar>(alphaName_);
 
     alphap = max(alphap, scalar(0));
     alphap = min(alphap, scalar(1));
@@ -129,6 +134,8 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField::write
 
     os.writeKeyword("flowRate") << flowRate_
         << token::END_STATEMENT << nl;
+    os.writeKeyword("alpha") << alphaName_
+        << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
index 10e6a2c889..34742c7567 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
@@ -39,6 +39,7 @@ Description
     \table
         Property     | Description             | Required    | Default value
         flowRate     | volumetric flow rate [m3/s] | yes |
+        alpha        | phase-fraction field    | yes |
     \endtable
 
     Example of the boundary condition specification:
@@ -47,6 +48,7 @@ Description
     {
         type            variableHeightFlowRateInletVelocity;
         flowRate        0.2;
+        alpha           alpha.water;
         value           uniform (0 0 0); // placeholder
     }
     \endverbatim
@@ -87,6 +89,9 @@ class variableHeightFlowRateInletVelocityFvPatchVectorField
         //- Inlet integral flow rate
         scalar flowRate_;
 
+        //- Name of the phase-fraction field
+        word alphaName_;
+
 
 public:
 
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index 36c9076486..5aa56a1062 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -53,9 +53,7 @@ void Foam::incompressibleTwoPhaseMixture::calcNu()
 Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
 (
     const volVectorField& U,
-    const surfaceScalarField& phi,
-    const word& alpha1Name,
-    const word& alpha2Name
+    const surfaceScalarField& phi
 )
 :
     IOdictionary
@@ -69,14 +67,14 @@ Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
             IOobject::NO_WRITE
         )
     ),
-    twoPhaseMixture(U.mesh(), *this, alpha1Name, alpha2Name),
+    twoPhaseMixture(U.mesh(), *this),
 
     nuModel1_
     (
         viscosityModel::New
         (
             "nu1",
-            subDict(phase1Name_ == "1" ? "phase1": phase1Name_),
+            subDict(phase1Name_),
             U,
             phi
         )
@@ -86,7 +84,7 @@ Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
         viscosityModel::New
         (
             "nu2",
-            subDict(phase2Name_ == "2" ? "phase2": phase2Name_),
+            subDict(phase2Name_),
             U,
             phi
         )
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
index 8ec33989c9..5c4920e17f 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
@@ -86,9 +86,7 @@ public:
         incompressibleTwoPhaseMixture
         (
             const volVectorField& U,
-            const surfaceScalarField& phi,
-            const word& alpha1Name = "alpha1",
-            const word& alpha2Name = "alpha2"
+            const surfaceScalarField& phi
         );
 
 
diff --git a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
index 7b95752f37..253b1092e7 100644
--- a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
+++ b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
@@ -31,29 +31,17 @@ License
 Foam::twoPhaseMixture::twoPhaseMixture
 (
     const fvMesh& mesh,
-    const dictionary& dict,
-    const word& alpha1Name,
-    const word& alpha2Name
+    const dictionary& dict
 )
 :
-    phase1Name_
-    (
-        dict.found("phases")
-      ? wordList(dict.lookup("phases"))[0]
-      : "1"
-    ),
-    phase2Name_
-    (
-        dict.found("phases")
-      ? wordList(dict.lookup("phases"))[1]
-      : "2"
-    ),
+    phase1Name_(wordList(dict.lookup("phases"))[0]),
+    phase2Name_(wordList(dict.lookup("phases"))[1]),
 
     alpha1_
     (
         IOobject
         (
-            dict.found("phases") ? word("alpha" + phase1Name_) : alpha1Name,
+            IOobject::groupName("alpha", phase1Name_),
             mesh.time().timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -66,7 +54,7 @@ Foam::twoPhaseMixture::twoPhaseMixture
     (
         IOobject
         (
-            dict.found("phases") ? word("alpha" + phase2Name_) : alpha2Name,
+            IOobject::groupName("alpha", phase2Name_),
             mesh.time().timeName(),
             mesh
         ),
diff --git a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H
index 668c4f2cfd..aa5ae24d04 100644
--- a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H
+++ b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H
@@ -67,9 +67,7 @@ public:
         twoPhaseMixture
         (
             const fvMesh& mesh,
-            const dictionary& dict,
-            const word& alpha1Name = "alpha1",
-            const word& alpha2Name = "alpha2"
+            const dictionary& dict
         );
 
 
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha1.org b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha1.org
rename to tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean
index 333348ffdf..99318580f3 100755
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # run from this directory
 \rm -f constant/triSurface/wigley-scaled-oriented.stl.gz
 
 cleanCase
-rm 0/alpha1.gz 0/cellLevel.gz 0/pointLevel.gz constant/polyMesh/boundary \
+rm 0/alpha.water.gz 0/cellLevel.gz 0/pointLevel.gz constant/polyMesh/boundary \
     > /dev/null 2>&1
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
index 28fec41b1f..2924a2cd45 100755
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
@@ -13,7 +13,7 @@ if [ ! -e log.transformPoints ]
 then
     transformPoints -scale '(2 1 1)' > log.transformPoints 2>&1
 fi
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/transportProperties b/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/transportProperties
index aa9b560484..8c6e7a2008 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/transportProperties
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ]  1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ]  1.48e-05;
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes
index 7018c5eaa7..de87355816 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes
@@ -55,7 +55,7 @@ fluxRequired
     default         no;
     p_rgh;
     pcorr;
-    alpha1;
+    alpha.water;
 }
 
 
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
index 76eaf8fd2a..e59fb400df 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 1;
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/setFieldsDict b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/setFieldsDict
index b249127996..75a2dfccb8 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/setFieldsDict
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (-100 -100 -100) (100 100 0);
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1 b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water
similarity index 99%
rename from tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1
rename to tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water
index 1b5529949c..766d8c1462 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1.org b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1.org
rename to tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water.org
index 0f3dcd4639..e1483e3c1e 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha1.org
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/transportProperties
index ff55cf97da..15e0e327a4 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water oir);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-4;
     rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
 }
 
-phase2
+oir
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-4;
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
index 3827ac6548..568660217f 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
@@ -53,7 +53,7 @@ fluxRequired
     default         no;
     p_rgh           ;
     pcorr           ;
-    alpha1          ;
+    alpha.water          ;
 }
 
 
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
index 87856ee3ca..4d0d891558 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/setFieldsDict
index 75b90a3695..c5884201fc 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (0 0 -1) (1 1 1);
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
similarity index 97%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
index 14593028c1..0adb2cfd3a 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
index b37439a124..c5ea29f7a5 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
@@ -19,14 +19,9 @@ mul             mul [ 1 -1 -1 0 0 ] 0.0065;
 
 muv             muv [ 1 -1 -1 0 0 ] 5.953e-06;
 
-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (vapour water);
 
-phase1
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
@@ -48,7 +43,7 @@ phase1
     }
 }
 
-phase2
+vapour
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 234af680ca..4507e794d2 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -73,7 +73,7 @@ functions
                 base        time;
             }
 
-            gamma
+            alpha.vapour
             {
                 mean        on;
                 prime2Mean  off;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
similarity index 97%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
index 669af89cbf..40cd251c1c 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
deleted file mode 100644
index 5321455943..0000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    inlet
-    {
-        type            zeroGradient;
-        value           uniform (0 0 0);
-    }
-
-    outlet
-    {
-        type            zeroGradient;
-        value           uniform (0 0 0);
-    }
-
-    walls
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    frontBack
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
deleted file mode 100644
index 669af89cbf..0000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      gamma;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-
-    outlet
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-
-    walls
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-
-    frontBack
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
deleted file mode 100644
index 9df6a831bf..0000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -2 0 0];
-
-internalField   uniform 10;
-
-boundaryField
-{
-    inlet
-    {
-        type            turbulentIntensityKineticEnergyInlet;
-        intensity       0.05;
-        value           uniform 0.05;
-    }
-
-    outlet
-    {
-        type            zeroGradient;
-    }
-
-    walls
-    {
-        type            kqRWallFunction;
-        value           uniform 10;
-    }
-
-    frontBack
-    {
-        type            zeroGradient;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
deleted file mode 100644
index c4d32cf2ff..0000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      nuSgs;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -1 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    outlet
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    walls
-    {
-        type            nutUSpaldingWallFunction;
-        value           uniform 0;
-    }
-    frontBack
-    {
-        type            nutUSpaldingWallFunction;
-        value           uniform 0;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
deleted file mode 100644
index 58cc484ff7..0000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
+++ /dev/null
@@ -1,51 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0];
-
-internalField   uniform 300e5;
-
-boundaryField
-{
-    inlet
-    {
-        type            totalPressure;
-        U               U;
-        phi             phiv;
-        rho             rho;
-        psi             none;
-        gamma           1;
-        p0              uniform 300e5;
-    }
-
-    outlet
-    {
-        type            fixedValue;
-        value           uniform 100e5;
-    }
-
-    walls
-    {
-        type            zeroGradient;
-    }
-
-    frontBack
-    {
-        type            zeroGradient;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
deleted file mode 100644
index ae5f186cb5..0000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      rho;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -3 0 0 0];
-
-internalField   uniform 845;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 845;
-    }
-
-    outlet
-    {
-        type            fixedValue;
-        value           uniform 835;
-    }
-
-    walls
-    {
-        type            zeroGradient;
-    }
-
-    frontBack
-    {
-        type            zeroGradient;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
index b5c25b61f8..06e40c886c 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
@@ -6,7 +6,6 @@ cd ${0%/*} || exit 1    # run from this directory
 
 rm -rf constant/polyMesh/sets > /dev/null 2>&1
 rm -rf 0 > /dev/null 2>&1
-cp -r 0.org 0
 rm system/topoSetDict > /dev/null 2>&1
 rm -rf processor[0-9] > /dev/null 2>&1
 cleanCase
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
index b37439a124..c5ea29f7a5 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
@@ -19,14 +19,9 @@ mul             mul [ 1 -1 -1 0 0 ] 0.0065;
 
 muv             muv [ 1 -1 -1 0 0 ] 5.953e-06;
 
-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (vapour water);
 
-phase1
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
@@ -48,7 +43,7 @@ phase1
     }
 }
 
-phase2
+vapour
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index e068adbb61..b78ee601a8 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -73,7 +73,7 @@ functions
                 base        time;
             }
 
-            gamma
+            alpha.vapour
             {
                 mean        on;
                 prime2Mean  off;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
similarity index 97%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
index 14593028c1..0adb2cfd3a 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
index b37439a124..c5ea29f7a5 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
@@ -19,14 +19,9 @@ mul             mul [ 1 -1 -1 0 0 ] 0.0065;
 
 muv             muv [ 1 -1 -1 0 0 ] 5.953e-06;
 
-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (vapour water);
 
-phase1
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
@@ -48,7 +43,7 @@ phase1
     }
 }
 
-phase2
+vapour
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
index d90b720092..6a1b3d978f 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alphawater.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alphawater;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
index 8821d7e1cc..78f3e40ad8 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
@@ -3,4 +3,4 @@ cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf processor*
-rm -rf 0/p_rgh.gz 0/p.gz 0/alphawater.gz 0/T*.gz
+rm -rf 0/p_rgh.gz 0/p.gz 0/alpha.water.gz 0/T*.gz
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
index ac803d715f..5d2fadf412 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-cp 0/alphawater.org 0/alphawater
+cp 0/alpha.water.org 0/alpha.water
 cp 0/p_rgh.org 0/p_rgh
 cp 0/p.org 0/p
 cp 0/T.org 0/T
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertiesair b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertiesair
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertieswater b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalPropertieswater
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
index 3582eeafa1..b44890f389 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
     div(phirb,alpha) Gauss interfaceCompression 1;
 
     div(rho*phi,U)  Gauss upwind;
-    div(phi,thermo:rhowater) Gauss upwind;
-    div(phi,thermo:rhoair) Gauss upwind;
+    div(phi,thermo:rho.water) Gauss upwind;
+    div(phi,thermo:rho.air) Gauss upwind;
     div(rho*phi,T)  Gauss upwind;
     div(rho*phi,K)  Gauss upwind;
     div(phi,p)      Gauss upwind;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
index 4e1aa83dc7..7a04bf3624 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alphawater
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 1;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
index f312b4e972..87fd237577 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alphawater 1
+    volScalarFieldValue alpha.water 1
     volScalarFieldValue p_rgh 1e5
     volScalarFieldValue p 1e5
     volScalarFieldValue T 300
@@ -31,7 +31,7 @@ regions
         radius 0.1;
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
             volScalarFieldValue p_rgh 1e6
             volScalarFieldValue p 1e6
             volScalarFieldValue T 578
@@ -42,7 +42,7 @@ regions
         box (-10 1 -1) (10 10 1);
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
         );
     }
 );
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz
new file mode 100644
index 0000000000000000000000000000000000000000..df712a5aac5a12e63a5700cfab0c51796a2c0f82
GIT binary patch
literal 5080
zcmeH{TTEJa9LJeHxY&3}I-}F6TeGc~EWtJ?6RMagx-`MowP;iXZ9)}YK%K(CidkG}
zCaukCvbI?26op#6MZ856wisu$F?xDH=a{z{TCiNAoMAZ#?98nXeOYoIx~KDhI8Xn4
z&NrXm@B2@bzKuIN!M3L~UTk@c1n?cU<mLA(V(#z>ii!SrdafEzNwe%-jv&)W&xy!y
z;>Rz*o5zB$oJ}4*p8im<{BB)jDOCH__6ndN4=8dxt{V}q9D%L|UIA^He*6AH!C*u{
zXdZYm15JUTXD9!mU|-Cu-UEdAO}9jTcZqp^krmibcbEsW3wB&g|CFoIFCxS~xaDW0
z@@lrAi9@!3jObvxb7p3R6!$M}R*gz11{wrQjjrJGIrGx~_Uv5KV$-fXO-|A2bm`22
zw1ittUcE~hvNC7J?>mM9?#iKiFH?QF&OOb#msH7?=N-^g6bsv_SqqtJ4^dNW^EKXX
z@!l%%l6Fw5`;naLJa~@ph?s1fzxt~d*fI(Q%khG1dds1+8Sv=!v(4^ik5r+dh@ML|
z%tV2Ar_JW<GcMd7<5!Ii+qwcu;)BNTXLTJWkIg-y;{|H(uzlNX-g#R%NgDWRyW;C)
z+meps&upsoEOz@-HqC20?zTabo$sc)jZnfrGr_)?0n7kq05gCYKx1HQIf_k}ZU9+N
z__5rL+)Q6rT(*;Q!j6W4+zrpn%OADG(=@iRGopgyeO0PXF<>Vc@RMbb&R`waN&u}a
zn~0A3L(A~w2cnCY`}kl@!x2m_fvtBFeD2jGQTb!Y)Hq{lq;<xjqIUP5QWrt39~Y(+
zpA@kc9F?l=X9)YEe&l*3IqXj<H)fic3|pgV+I8a1jnxljZ=t~t(Wr&%h=JXe`qwgt
z`yg;|Z3M*2_*#3+^f5Hd_oJwV#x4P2et3-pc)#Emki&?)SE&itx&NjnM;)d1CEwh*
zf6hL(c}^69<}X7fNb<;O)#-e#bwbW1?cTj`1V#o4&w}`YGRSeoG9His4VM+0Vp6uV
zDs&wUe=8}9U9Yy3^cJtu=Io<jwTmCS8@-Nf93)kBh~eaRK1>C<O<@XwG8fgNe9Cy;
z`R`N6no!5VOBCN9Rs_AMl#7886KlpI?*+rqWDYOR%O_?zIW0ymiK}XFg?pa<-4GM!
zQHOXBl2*k`Bhu~qGHAnK8SiKXyt2>GCI9mOm~6%wq(^jUz|j9fx#Rwg^N3Z4Ocun)
z!&Vhb!%?vacE0JXC>o6!+>OpRS)+`iH&K0@x@Gt=)mb59kJFLosI=tOf&*cSgPvUd
zI#L}YVG>p0ak%#+U44}RSyr)@JF|$a2CHtyl1A%}N2L?Hj2XZTU<NP)n1TN`P@TxS
zcCwJ4G8xOPn`^3vr+=op)1RnT>jg>o47Z;xm9Ls9>Q6qWX9UrEsU8RQyVLi3g&(by
d(nlGi3<d*+LyHVSp)kzA>Eo2mxNp;Oe*ui+pdkPN

literal 0
HcmV?d00001

diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e8108f6babb69340f8a9c065fff37deb0d29ab50
GIT binary patch
literal 5082
zcmeH|T})eL9LDR2!)!s8uo>*AOU%@|WflUg@>v;B$gr?(1L9CRmH=ystst~gLYZPp
zq?;x~Kw+h$h1RV=rv=&++C#+31_5?<fXPQ&2tf+;BhX`^Ee9;P7`;3f^TwWw_v+;N
zKlwe+|9wvgUc&5uewHT`7Pc^$4<g&O)T~ZP@NIU4MBRC`{n{j6kYp9x4$OA9zkcL%
zoa(&WblC55SY%I7d<*CCtEES-!X=+BOo5V^E=h{ZQ4{D$;pmFpQ;;Qb$GS0`tq9yL
zU+P*Lg!>`LwV2hy+2FB0SqIArCMRFmIG!6jO4~KcMN0~D_M#(qr{7Vz!;Qe+xwZ3Q
z6sve1R&VF;^b&2k&XhrYIm!8J-HK9H&I2nr<CPA-!l9+{jRpNs)o9hKFiuF)>2&eA
zU2(77s`3C1ssGf_5@EykVAsib@ZDAvl5SsD8a&aAd?9s{A|sje?aFEY{$_tU$?~Y!
z)5cqW3T{z0OLTW*qU@W?1W}--?$Nd1`oQ_ga?WEMrvNZ-+p9qr0O+fo)h>ZVN#ZUG
zl({Ep974rnoyFcUIs8p8yQt?Ui+EQ`yi-}P|5-HavN+W`)^5q|d}IMu))*2B*Gcb&
z1St5(G-tHRobe9u{e)?`FScTiw^7z-7}Gt}H5vW>O2v2j2>1y22>1y22%sSlq7ip6
zz?i1%)9Hhwv-BTmrGw@;N*fN11_m>bhabNGidI5zFk~g$8DErHBPIwMA>W-$ylHHV
zM%Yh7x!I8UAS%^?i_|P)lAT^V$&6+y_QX`s1rqW^V%ouy?eEv~`dGnQ#oMK*Uceg>
z$MQ1;M)2fF!CI0%ZTcf?#9Y5ud!?}<<6~JX4-AlOO35TdOjmjMpr<J*9F^zZdw6+H
zvi-b4^KZ|sBAz?4ne9%7m@1rv^8y;tHZfj)1^)WY56<Si#ib3~7_x=m|8~tEf99Ga
zJGbu|;Da%jqy}dW*^XuirdN)a9~W;%=ov(u3ZkSS7wLOAyg_CFpSkssH;uwWh|?6x
zWijB{j3IL+rS&+P0U=Ux2lJTrblI9_MXhCHna1=)MC@&xh_?<y89)J)4qTtHD)Qj5
zi4{~usqs4hC-Y`+O#m|+yDFo_A~2+w?uH0WY)?_JHoQ!OhWtR@>ETtrcO8D5p$u6|
zAu4crW^Y4c0{(yqExh6Yi5EJ6cq`tFMVwF=mv#wV#cMkMi)2%isadL8W4)%#P&$|E
zH7{U#lXbTzk`TD)tQ8hW4a^v_{Q#OY=R=P^&oxR-dk(9QxtdAM>M`ReN=xr4Zgx;d
z(X)aRG<mRYVnx-*2m6}HL^K>Qm>Yu^zRf(tO$j<POIMfg(+$?jzUoGGE1?_d``bsr
zN5DtGN8o=*z_vJIIXN;$&K?xlwiM|AQT@<Z=z=x2mk-vt!EKjCvt3yK;=MzucTe@;
pO<H`|8{v_PU$7nb8{`cFK^l#gAh_~g0!?%nGi5#3c;L%;%%9N`sRIB2

literal 0
HcmV?d00001

diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alphawater.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alphawater.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
index 3ec07f62c5..f33fd89a62 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
@@ -3,6 +3,6 @@ cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf processor*
-rm -rf 0/p_rgh.gz 0/p.gz 0/alphawater.gz 0/T.gz
+rm -rf 0/p_rgh.gz 0/p.gz 0/alpha.water.gz 0/T.gz
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
index 11b84a3251..33c1da4fd3 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-cp 0/alphawater.org 0/alphawater
+cp 0/alpha.water.org 0/alpha.water
 cp 0/p_rgh.org 0/p_rgh
 cp 0/p.org 0/p
 cp 0/T.org 0/T
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertiesair b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertiesair
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertieswater b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalPropertieswater
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
index 3582eeafa1..b44890f389 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
     div(phirb,alpha) Gauss interfaceCompression 1;
 
     div(rho*phi,U)  Gauss upwind;
-    div(phi,thermo:rhowater) Gauss upwind;
-    div(phi,thermo:rhoair) Gauss upwind;
+    div(phi,thermo:rho.water) Gauss upwind;
+    div(phi,thermo:rho.air) Gauss upwind;
     div(rho*phi,T)  Gauss upwind;
     div(rho*phi,K)  Gauss upwind;
     div(phi,p)      Gauss upwind;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
index 4e1aa83dc7..7a04bf3624 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alphawater
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 1;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
index dc90a362c0..2103e99c13 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alphawater 1
+    volScalarFieldValue alpha.water 1
     volScalarFieldValue p_rgh 1e5
     volScalarFieldValue p 1e5
     volScalarFieldValue T 300
@@ -31,7 +31,7 @@ regions
         radius 0.1;
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
             volScalarFieldValue p_rgh 1e6
             volScalarFieldValue p 1e6
             volScalarFieldValue T 578
@@ -42,7 +42,7 @@ regions
         box (-10 1 -1) (10 10 1);
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
         );
     }
 );
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
index f1ad15f1c2..e0eda6f9eb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1 b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1
rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
index f1ad15f1c2..e0eda6f9eb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha1
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
index 64223ec7b8..f9baf8b3e1 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
@@ -22,7 +22,7 @@ dynamicRefineFvMeshCoeffs
     // How often to refine
     refineInterval  1;
     // Field to be refinement on
-    field           alpha1;
+    field           alpha.water;
     // Refine field inbetween lower..upper
     lowerRefineLevel 0.001;
     upperRefineLevel 0.999;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
index ba430bce29..81106f5ea4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
@@ -15,7 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -37,7 +39,7 @@ phase1
     }
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
index 63d54a7c3d..f47969d4bf 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
index 0af0cd2da7..47ad156601 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
     volVectorFieldValue U ( 0 0 0 )
 );
 
@@ -28,7 +28,7 @@ regions
         box ( 0 0 0 ) ( 0.6 0.1875 0.75 );
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
  );
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha1 b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha1
rename to tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
index c3b0586036..e09e2739bd 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha1
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
index 02287f422b..3729fc7648 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
index 1202013c58..d3c114226b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
@@ -29,7 +29,7 @@ solvers
         mergeLevels     1;
     }
 
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
index 22fcdc05b5..2506a693af 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -25,13 +25,13 @@ regions
     boxToCell
     {
         box ( -100 -100 -100 ) ( 100 100 0.5368 );
-        fieldValues ( volScalarFieldValue alpha1 1 );
+        fieldValues ( volScalarFieldValue alpha.water 1 );
     }
 
     boxToCell
     {
         box ( 0.7 0.8 -100 ) ( 100 100 0.65 );
-        fieldValues ( volScalarFieldValue alpha1 1 );
+        fieldValues ( volScalarFieldValue alpha.water 1 );
     }
 );
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha1 b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha1
rename to tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
index cee67a8884..17678343e2 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha1
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
index c74dee04a7..0d7bbe9e60 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
@@ -15,21 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (water air);
 
-phase1
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 300;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
index 7e8fa0fb1a..946d84ed62 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr          1;
         nAlphaSubCycles     2;
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
index 7415f2fc76..defca08b47 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 1
+    volScalarFieldValue alpha.water 1
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (-4 -4 -1) (4 4 0.74);
         fieldValues
         (
-            volScalarFieldValue alpha1 0
+            volScalarFieldValue alpha.water 0
         );
     }
 );
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
index 452b5dd51c..70366ec29f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
index 4ee30b518c..faacf01f18 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
index 3b8cb649c2..7ea0ac7744 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # run from this directory
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
index 02287f422b..3729fc7648 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
index 696ba9cc79..0f9b300499 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
index ec8d1717d5..410a0a6f10 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box ( -100 -100 -100 ) ( 100 100 0 );
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
index 452b5dd51c..70366ec29f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
index 4ee30b518c..faacf01f18 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
index 3b8cb649c2..7ea0ac7744 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # run from this directory
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
index 02287f422b..3729fc7648 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
index 696ba9cc79..0f9b300499 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
index ec8d1717d5..410a0a6f10 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box ( -100 -100 -100 ) ( 100 100 0 );
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
index f40309af2e..bdebcf1ab4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
index 4ee30b518c..faacf01f18 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
index 3b8cb649c2..7ea0ac7744 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # run from this directory
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
index 02287f422b..3729fc7648 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
index 696ba9cc79..0f9b300499 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
index ec8d1717d5..410a0a6f10 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box ( -100 -100 -100 ) ( 100 100 0 );
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
index f40309af2e..bdebcf1ab4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
index 4ee30b518c..faacf01f18 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
index 3b8cb649c2..7ea0ac7744 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # run from this directory
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
index 02287f422b..3729fc7648 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
index 696ba9cc79..0f9b300499 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
index ec8d1717d5..410a0a6f10 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box ( -100 -100 -100 ) ( 100 100 0 );
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
index f40309af2e..bdebcf1ab4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
index 4ee30b518c..faacf01f18 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
index 3b8cb649c2..7ea0ac7744 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # run from this directory
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
index 02287f422b..3729fc7648 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
index 696ba9cc79..0f9b300499 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
index 7ff571c6d1..5ea2a37352 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -25,7 +25,7 @@ regions
     boxToCell
     {
         box ( -100 -100 -100 ) ( 100 100 0 );
-        fieldValues ( volScalarFieldValue alpha1 1 );
+        fieldValues ( volScalarFieldValue alpha.water 1 );
     }
 );
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org
rename to tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
index f40309af2e..bdebcf1ab4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
index 82e093ec03..5874c7a050 100755
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf 0/alpha1
+rm -rf 0/alpha.water
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
index 0f2a6dea43..4e10bfcacc 100755
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
index 02287f422b..3729fc7648 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
index 54f20e5253..39d907fa79 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
index 8229dc2582..3b3ed7f998 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -25,7 +25,7 @@ regions
     boxToCell
     {
         box ( -100 -100 -100 ) ( 100 100 -0.0025);
-        fieldValues ( volScalarFieldValue alpha1 1 );
+        fieldValues ( volScalarFieldValue alpha.water 1 );
     }
 );
 
diff --git a/tutorials/multiphase/interFoam/laminar/Allclean b/tutorials/multiphase/interFoam/laminar/Allclean
index 909068ce6c..d5d1e50d10 100755
--- a/tutorials/multiphase/interFoam/laminar/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/Allclean
@@ -9,7 +9,7 @@ loseCases="damBreakFine"
 
 for case in $keepCases
 do
-    (cd $case && foamCleanTutorials && rm -rf 0/alpha1)
+    (cd $case && foamCleanTutorials && rm -rf 0/alpha.water)
 done
 
 for case in $loseCases
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 510e4498db..c0e6661c4b 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@@ -28,7 +28,7 @@ setDamBreakFine ()
     cd damBreak || exit
 
     runApplication blockMesh
-    cp 0/alpha1.org 0/alpha1
+    cp 0/alpha.water.org 0/alpha.water
     runApplication setFields
     runApplication `getApplication`
 )
@@ -44,7 +44,7 @@ cloneCase damBreak damBreakFine
 
     # And execute
     runApplication blockMesh
-    cp ../damBreak/0/alpha1.org 0/alpha1
+    cp ../damBreak/0/alpha.water.org 0/alpha.water
     runApplication setFields
     runApplication decomposePar
     runParallel `getApplication` 4
@@ -56,7 +56,7 @@ cloneCase damBreak damBreakFine
     cd capillaryRise || exit
 
     runApplication blockMesh
-    cp 0/alpha1.org 0/alpha1
+    cp 0/alpha.water.org 0/alpha.water
     runApplication setFields
     runApplication `getApplication`
 )
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha1.org b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha1.org
rename to tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
index 2b39cb45eb..73d4778c97 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
@@ -15,7 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [0 2 -1 0 0 0 0] 1e-06;
@@ -36,7 +38,7 @@ phase1
     }
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [0 2 -1 0 0 0 0] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
index 2a580ed9eb..aded32f195 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
@@ -53,7 +53,7 @@ fluxRequired
     default         no;
     p_rgh;
     pcorr;
-    alpha1;
+    alpha.water;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
index 6bea572056..36156e8614 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
index b6a5cdd65a..91bd115659 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -28,7 +28,7 @@ regions
 
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org
rename to tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
index df85d65055..b2319f1aa5 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
index ba430bce29..81106f5ea4 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
@@ -15,7 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -37,7 +39,7 @@ phase1
     }
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
index 986a20eebe..1d9632b674 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
@@ -53,7 +53,7 @@ fluxRequired
     default         no;
     p_rgh;
     pcorr;
-    alpha1;
+    alpha.water;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
index 6bea572056..36156e8614 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
index 3152d48347..2a577a3c7d 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (0 0 -1) (0.1461 0.292 1);
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
similarity index 97%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
index 94befdfae8..baf41e0bb3 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.fuel;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
index fa41fd38c3..c74376aa3f 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
@@ -15,14 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (fuel air);
 
-phase1
+fuel
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 5.952e-06;
@@ -44,7 +39,7 @@ phase1
     }
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 8.5e-07;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
index d7383123a6..479dee58a2 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.fuel
     {
         nAlphaCorr      1;
         nAlphaSubCycles 4;
diff --git a/tutorials/multiphase/interFoam/ras/Allclean b/tutorials/multiphase/interFoam/ras/Allclean
index 63a607fe3f..f76151df3d 100755
--- a/tutorials/multiphase/interFoam/ras/Allclean
+++ b/tutorials/multiphase/interFoam/ras/Allclean
@@ -13,12 +13,12 @@ do
 
     if [ "$case" = "damBreak" ]
     then
-        cp $case/0/alpha1.org $case/0/alpha1
+        cp $case/0/alpha.water.org $case/0/alpha.water
     fi
 
     if [ "$case" = "damBreakPorousBaffle" ]
     then
-        cp $case/0/alpha1.org $case/0/alpha1
+        cp $case/0/alpha.water.org $case/0/alpha.water
     fi
 
 done
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index f130490987..0378faad39 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -23,9 +23,6 @@ setDamBreakFine ()
     mv temp.$$ $controlDict
 }
 
-# Do damBreakPorousBaffle
-(cd damBreakPorousBaffle && foamRunTutorials)
-
 # Do damBreak
 (cd damBreak && foamRunTutorials)
 
@@ -37,7 +34,7 @@ cloneCase damBreak damBreakFine
 
     # Modify case
     setDamBreakFine
-    cp ../damBreak/0/alpha1.org 0/alpha1
+    cp ../damBreak/0/alpha.water.org 0/alpha.water
     # And execute
     runApplication blockMesh
     runApplication setFields
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
similarity index 97%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/alpha1
rename to tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
index df85d65055..b2319f1aa5 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
rename to tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
index 5dc1b6e2d0..b2319f1aa5 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
index ef3e8c7b4b..81106f5ea4 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
@@ -15,14 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (water air);
 
-phase1
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -44,7 +39,7 @@ phase1
     }
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
index a30ce4ddb8..f6725a947b 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 4;
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
index 3152d48347..2a577a3c7d 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (0 0 -1) (0.1461 0.292 1);
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1 b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
similarity index 97%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1
rename to tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
index bf6106677f..e083c1f792 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alpha1.org;
+    object      alpha.water.org;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1.org b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
similarity index 97%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1.org
rename to tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
index bf6106677f..e083c1f792 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alpha1.org;
+    object      alpha.water.org;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
index e8f209f7c1..3142dc8a64 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
@@ -24,6 +24,7 @@ boundaryField
     leftWall
     {
         type            epsilonWallFunction;
+        value           uniform 0.1;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -32,6 +33,7 @@ boundaryField
     rightWall
     {
         type            epsilonWallFunction;
+        value           uniform 0.1;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -40,6 +42,7 @@ boundaryField
     lowerWall
     {
         type            epsilonWallFunction;
+        value           uniform 0.1;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
index cb36fb3b7d..0b3ae667f0 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
@@ -25,16 +25,19 @@ boundaryField
     {
         type            fixedFluxPressure;
         gradient        uniform 0;
+        value           uniform 0;
     }
     rightWall
     {
         type            fixedFluxPressure;
         gradient        uniform 0;
+        value           uniform 0;
     }
     lowerWall
     {
         type            fixedFluxPressure;
         gradient        uniform 0;
+        value           uniform 0;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
index ef3e8c7b4b..81106f5ea4 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
@@ -15,14 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (water air);
 
-phase1
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -44,7 +39,7 @@ phase1
     }
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
index 96c64a2a1c..a7103f6d62 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 4;
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
index 3152d48347..2a577a3c7d 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (0 0 -1) (0.1461 0.292 1);
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha1.org b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/0/alpha1.org
rename to tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allclean b/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
index 0c04649fe1..72f44cb9ea 100755
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm 0/alpha1.gz 0/alpha1 2>/dev/null
+rm 0/alpha.water.gz 0/alpha.water 2>/dev/null
 rm -rf *Flux
 
 cleanCase
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
index 813ad03d79..7eef6a06be 100755
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
@@ -17,7 +17,7 @@ while [ "$i" -lt 3 ] ; do
     i=`expr $i + 1`
 done
 
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 
 runApplication $application
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
index 7018c5eaa7..de87355816 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
@@ -55,7 +55,7 @@ fluxRequired
     default         no;
     p_rgh;
     pcorr;
-    alpha1;
+    alpha.water;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
index 62774a7610..cc69de4db5 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
index 468fd9778b..0caad94498 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (0 0 0) (50 130 27);
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 
@@ -36,7 +36,7 @@ regions
         box (0 0 0) (50 10.0001 24);
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
index c90677dd56..b86717bf8d 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
@@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ]  1e-06;
     rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ]  1.48e-05;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
index bb536c017c..40a4e9640d 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
@@ -56,7 +56,7 @@ fluxRequired
     default         no;
     p_rgh;
     pcorr;
-    alpha1;
+    alpha.water;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
index e2db3124d4..d2428017c4 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 3;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
index f4f1c44476..2258df9f4f 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (-10 -20 -10) (200 20 4);
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
index 92b06fe0a6..6c087afc7d 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
@@ -26,6 +26,7 @@ boundaryField
     {
         type            variableHeightFlowRateInletVelocity;
         flowRate        $inletFlowRate;
+        alpha           alpha.water;
         value           uniform (0 0 0);
     }
 
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
similarity index 98%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org
rename to tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
index deeaf2f3df..180c83d03e 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
index da58c047f1..858f388243 100755
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
@@ -7,7 +7,7 @@ cp -r 0.org 0 > /dev/null 2>&1
 
 runApplication blockMesh
 
-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 
 runApplication setFields
 
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
index ef3e8c7b4b..81106f5ea4 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
@@ -15,14 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (water air);
 
-phase1
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@@ -44,7 +39,7 @@ phase1
     }
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
index 3693fa3dfe..dc48e429db 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         nAlphaCorr      1;
         nAlphaSubCycles 2;
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
index 26d6b7f2a6..76fa077e7f 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
@@ -16,7 +16,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
 
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha1 b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
similarity index 97%
rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha1
rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
index a2e32cc8e8..3a2097df24 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha1
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
index 92e543ecce..be3d97f20a 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
@@ -15,20 +15,22 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+phases (water vapour);
+
 phaseChangeTwoPhaseMixture SchnerrSauer;
 
 pSat             pSat       [1 -1 -2 0 0]    2300;   // saturation pressure
 
 sigma           sigma [1 0 -2 0 0 0 0] 0.07;
 
-phase1
+water
 {
     transportModel Newtonian;
     nu              nu [0 2 -1 0 0 0 0] 9e-07;
     rho             rho [1 -3 0 0 0 0 0] 1000;
 }
 
-phase2
+vapour
 {
     transportModel Newtonian;
     nu              nu [0 2 -1 0 0 0 0] 4.273e-04;
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
index 733980447c..e60864d7f5 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
@@ -60,7 +60,7 @@ fluxRequired
     default         no;
     p_rgh;
     pcorr;
-    alpha1;
+    alpha.water;
 }
 
 
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
index 8673ec2625..e7a73630a8 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         cAlpha          0;
         nAlphaCorr      2;
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha1 b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha.water
similarity index 97%
rename from tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha1
rename to tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha.water
index c3754beb68..6ca929b855 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha1
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha.water
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
index c78a74d48d..a9e6e6525d 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
@@ -14,20 +14,22 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+phases (water vapour);
+
 phaseChangeTwoPhaseMixture SchnerrSauer;
 
 pSat             pSat       [1 -1 -2 0 0]    2300;   // saturation pressure
 
 sigma           sigma [1 0 -2 0 0 0 0] 0.07;
 
-phase1
+water
 {
     transportModel Newtonian;
     nu              nu [0 2 -1 0 0 0 0] 9e-07;
     rho             rho [1 -3 0 0 0 0 0] 1000;
 }
 
-phase2
+vapour
 {
     transportModel Newtonian;
     nu              nu [0 2 -1 0 0 0 0] 4.273e-04;
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index 8ddd1fe903..ded24b94b6 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
@@ -56,7 +56,7 @@ fluxRequired
     default              none;
     p_rgh;
     pcorr;
-    alpha1;
+    alpha.water;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
index a1f8f8ffd5..41c0ac39c6 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    alpha1
+    alpha.water
     {
         cAlpha          0;
         nAlphaCorr      2;
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha1 b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
similarity index 97%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha1
rename to tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
index 65b89ea284..0b43750be0 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha1
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alpha1;
+    object      alpha.sludge;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
index df0c151c83..5c4f2ad6c6 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
@@ -18,14 +18,16 @@ FoamFile
 Dab           Dab [0 2 -1 0 0 0 0]     1e-06;
 alphatab      alphatab [0 0 0 0 0 0 0] 1;
 
-phase1
+phases (sludge water);
+
+sludge
 {
     transportModel  Newtonian;
     nu              nu [0 2 -1 0 0 0 0] 1e-06;
     rho             rho [1 -3 0 0 0 0 0] 1000;
 }
 
-phase2
+water
 {
     transportModel  Newtonian;
     nu              nu [0 2 -1 0 0 0 0] 1e-06;
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
index 35930b9203..c4837bb39f 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     default         none;
 
     div(rho*phi,U)  Gauss linear;
-    div(phi,alpha1) Gauss vanLeer;
+    div(phi,alpha)  Gauss vanLeer;
     div(phi,k)      Gauss limitedLinear 1;
     div((muEff*dev(T(grad(U))))) Gauss linear;
 }
@@ -55,7 +55,7 @@ fluxRequired
 {
     default         no;
     p_rgh;
-    alpha1;
+    alpha.sludge;
 }
 
 
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
index af87b0880f..6ad387f715 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    "alpha1.*"
+    "alpha.sludge.*"
     {
         nAlphaSubCycles     2;
         nAlphaCorr          1;
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
index 2c45b1faae..12f879946c 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
@@ -16,7 +16,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.sludge 0
     volVectorFieldValue U (0 0 0)
 );
 
@@ -28,7 +28,7 @@ regions
 
         fieldValues
         (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.sludge 1
         );
     }
 );

From e30b94b385d30f2fbef90aa27f71437e25dde35c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 13 Aug 2013 23:22:21 +0100
Subject: [PATCH 5/7] thermophysicalModels: Removed redundant H function

---
 .../solidProperties/solidProperties/solidProperties.H     | 3 ---
 .../solidProperties/solidProperties/solidPropertiesI.H    | 6 ------
 src/thermophysicalModels/specie/thermo/thermo/thermo.H    | 3 ---
 src/thermophysicalModels/specie/thermo/thermo/thermoI.H   | 8 --------
 4 files changed, 20 deletions(-)

diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
index 3d77628cfa..6ae416d8c8 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
@@ -173,9 +173,6 @@ public:
             //- Heat of formation [J/kg]
             inline scalar Hf() const;
 
-            //- Total enthalpy - reference to Tstd [J/kg]
-            inline scalar H(const scalar T) const;
-
             //- Sensible enthalpy - reference to Tstd [J/kg]
             inline scalar Hs(const scalar T) const;
 
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
index 11f6c79e02..05b6ad9c94 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
@@ -51,12 +51,6 @@ inline Foam::scalar Foam::solidProperties::Hf() const
 }
 
 
-inline Foam::scalar Foam::solidProperties::H(const scalar T) const
-{
-    return Hs(T) + Hf_;
-}
-
-
 inline Foam::scalar Foam::solidProperties::Hs(const scalar T) const
 {
     return Cp_*(T - specie::Tstd);
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
index bacceb36bc..974582b529 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
@@ -217,9 +217,6 @@ public:
                 //- Enthalpy/Internal energy [J/kg]
                 inline scalar HE(const scalar p, const scalar T) const;
 
-                //- Enthalpy [J/kg]
-                inline scalar H(const scalar p, const scalar T) const;
-
                 //- Sensible enthalpy [J/kg]
                 inline scalar Hs(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
index ab19475eda..1de3149916 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
@@ -215,14 +215,6 @@ Foam::species::thermo<Thermo, Type>::HE(const scalar p, const scalar T) const
 }
 
 
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::H(const scalar p, const scalar T) const
-{
-    return this->h(p, T)/this->W();
-}
-
-
 template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::Hs(const scalar p, const scalar T) const

From febbc29a90bd15712b2ac34f84de01445e8f6b1c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 13 Aug 2013 23:22:50 +0100
Subject: [PATCH 6/7] tutorials: ensure the creation of the 0-directory as
 necessary

---
 .../incompressible/pisoFoam/les/motorBike/motorBike/Allrun      | 2 +-
 tutorials/incompressible/simpleFoam/turbineSiting/Allrun        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
index 3815c35895..5a71c3e1b8 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
@@ -19,7 +19,7 @@ runParallel snappyHexMesh 8 -overwrite -parallel
 
 find . -type f -iname "*level*" -exec rm {} \;
 
-ls -d processor* | xargs -i cp -r 0.org/* ./{}/0/ $1
+ls -d processor* | xargs -i cp -r 0.org ./{}/0 $1
 
 runParallel renumberMesh 8 -overwrite
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
index 9852cc1cf9..d08deac007 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
@@ -16,7 +16,7 @@ runParallel snappyHexMesh 4 -overwrite
 
 find . -type f -iname "*level*" -exec rm {} \;
 
-ls -d processor* | xargs -i cp -r 0.org/* ./{}/0/ $1
+ls -d processor* | xargs -i cp -r 0.org ./{}/0 $1
 
 runParallel topoSet 4
 runParallel `getApplication` 4

From c7a18b6b4a1b378c861d01eb2dbfd33a46080c32 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 13 Aug 2013 23:26:26 +0100
Subject: [PATCH 7/7] Correct line length

---
 .../solvers/multiphase/cavitatingFoam/alphavPsi.H     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
index e988d30737..ed799ae4b4 100644
--- a/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
+++ b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
@@ -1,5 +1,14 @@
 {
-    alphav = max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0));
+    alphav =
+        max
+        (
+            min
+            (
+                (rho - rholSat)/(rhovSat - rholSat),
+                scalar(1)
+            ),
+            scalar(0)
+        );
     alphal = 1.0 - alphav;
 
     Info<< "max-min alphav: " << max(alphav).value()