diff --git a/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
new file mode 100644
index 0000000000000000000000000000000000000000..e988d3073733e69e664d9b2014b3ea8e317395ea
--- /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 73e9577029b89c186478b4a211cbff054f69d5e6..c4453df391c30bd98a2f8f2908770a83755edcb5 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 ce618ee40f2c3a04bf660d08c385389ecdebd570..14b0ef77861a58f121e9f1b403acd6033392aa7e 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 8958dc3c5ed261572dd3a34ee118de9038bb7cc0..605c0deece751a5d754639e5b47075d0888b57ca 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 4edda7336de09a5e212dbded85bcc70c2ddee6dc..0000000000000000000000000000000000000000
--- 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 b2c7d953b5368b2b46adb91223c06d9ceab4242d..da43e67ce7bb5e2b0fcf565a86eb7d56fd8a2df9 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 d81f5ccb1f249ff004711bfaeef3ca9bf4049ae0..e9c5322c79f842ebb727455a7585af53658ffc45 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 0e9e8ae3496b40e6efb62cc279163d3f406dcf95..f7cc2eae2114348ce56b1064ca900711b36ff24a 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 39ccad53825767d7e93a3b64f73d827d36edab27..f0290efc959ac5cabf0ccaf4dc4652f65ec432e2 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 87c261da9b86bf2838e7f8742f5509b62431ee03..72fdb7245eb2917dbf747f122c7954c71acaf9e1 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 7dd8e841c831568ff46b96acf265532033c45f9b..e675c83df75293c8244ec6de78deedf211a8c067 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 36cb56a0c256ff2ea836f5562c51e2ca74767c86..f157fa75e00221f77000a29fc83b074ea6135004 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 beef7fc7fce9a4797eba655d0e09968b426aa0c0..ce096105d9012b3423912828d210ad4979ae3502 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 08728c8f926b94c29e68b2c78ea8d89d310fbcba..0a86459705cdda66fafaf800cc1f327f1a8d6c60 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 c08eba939067edd6151c61816c6ac510b2f25ffc..d25fbdfec9c248140be271dd5568e2977475e20f 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 e05476390b6424f2f530e115a13319a6f7664966..227768ac8d3f4dc34d505a2fbab34947ce8eced3 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 c68a0e56c5c794542ad1925514cef31ce555d4ec..adca48e96529294758a2a542d1e12c74240f248a 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 72af0d8d9c08ce5aad71fdfafc80110c2c7496e0..1fcc5feb7df1b98caa271b0d635e920a86b97f96 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 10e6a2c88993741da7567025b845de155dcc2247..34742c7567bbe4ba0d02a8a9bfa511b02ad396e9 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 36c9076486a90b0338047c05833cb6abf82941e9..5aa56a1062622e9a48af5530a774da782e08ad35 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 8ec33989c98faf2021442cc9016f47a518880d70..5c4920e17f4bf853dd2ad1922c6f4bd18df89ef1 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 7b95752f370e941080c937ed016b528c2b66e089..253b1092e754593a82f42924ff895ac67e89d0d2 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 668c4f2cfd2161ba1987e2c6f5abfe51f62b354c..aa5ae24d04b69e6ddbe86addf7b053e9c0d3be9e 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 333348ffdf086d1b15ecd02c5784ed9526a762be..99318580f37b2829b01017564b74b5cd6bb90204 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 28fec41b1faeac26db1ea45fd5897666765f63e9..2924a2cd45d243fa19a6314fc36a6a2b52e0be67 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 aa9b560484a10ef92f93801e7965b76ff3d8f338..8c6e7a2008d3c96587ed8b4e44343305074fa29c 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 7018c5eaa736966eedef0d3358cf514187949c90..de873558162e1e1cea020af091244cba613e96e7 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 76eaf8fd2a3d1ce01aa7564134a7737d9b5e6f28..e59fb400df2ad2fc686c3780ad05551c936ae55c 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 b2491279962daab27aee162d8b8776f6a66ff7e5..75a2dfccb82c5a9d720f80695f612f9a36f57515 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 1b5529949cad6bbc76c0df26e4a25e7fa96f5fe4..766d8c1462422f121b9c55e00e2ccb5401e42f82 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 0f3dcd46393f9b498f154afa8e76bbbe50579b1e..e1483e3c1ea0f46f5be5c2d819f89291fe8b3ace 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 ff55cf97dad31b0403a30e5dd0668f006a99c0d7..15e0e327a49d7997cbcad52745d29b00992d3eb0 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 3827ac6548c856001186bea04d81494e454c8392..568660217fe3cdf6d0843a3fff4f058d4d03d1bb 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 87856ee3ca139aff10b36730998d69bc6218bd33..4d0d8915585ae0ad52befebedf17f83d7226bd46 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 75b90a3695a92e3ef8b05ce50fccbedb5a0e10cb..c5884201fc74aded2683c9dabc280eaf0acb90a7 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 14593028c1e6e0a102d4f112338573cdc932284a..0adb2cfd3a77955ce18a09957f6187eca8882c7e 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 b37439a124fb7f91bde8f01f415c8be2d6f87399..c5ea29f7a5d43a3f5d9e5e5917da98c736994460 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 234af680caff976501ed98fef7e2b83ddc411498..4507e794d2f4239b8e053e34a806c6e2f9092eda 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 669af89cbff8e23be985372b1eb343e9a8a120b3..40cd251c1c2e76e4b94a7cdc5eb5ceab8e27418b 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 5321455943ce9ed7c92adfa059a1011d070021b6..0000000000000000000000000000000000000000
--- 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 669af89cbff8e23be985372b1eb343e9a8a120b3..0000000000000000000000000000000000000000
--- 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 9df6a831bf7d92eee132130ce0f14958784163a5..0000000000000000000000000000000000000000
--- 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 c4d32cf2ff7d6597b53e84048a1078b387fa7df9..0000000000000000000000000000000000000000
--- 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 58cc484ff7c1da64dbb69f56640a380da66e5d1f..0000000000000000000000000000000000000000
--- 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 ae5f186cb51c4303dd4c6e4c64ddc5d358e8285a..0000000000000000000000000000000000000000
--- 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 b5c25b61f84e7b7dc0d5251d6d11203e312a2229..06e40c886cf72c17b982bb417f4e5c6f61ce9985 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 b37439a124fb7f91bde8f01f415c8be2d6f87399..c5ea29f7a5d43a3f5d9e5e5917da98c736994460 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 e068adbb61a2b4c1a5b49ceb922e65afacb1a5df..b78ee601a857b8f522443e0e2dca5f1d9f6ba153 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 14593028c1e6e0a102d4f112338573cdc932284a..0adb2cfd3a77955ce18a09957f6187eca8882c7e 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 b37439a124fb7f91bde8f01f415c8be2d6f87399..c5ea29f7a5d43a3f5d9e5e5917da98c736994460 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 d90b720092af3d27f74cf6ca3cb23723735c73da..6a1b3d978fe7c29234f98ca47a896163fb62d961 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 8821d7e1cc12328cac82fd5fbcfeb2cd2198e4ef..78f3e40ad832ead7ed3e2070cdadf94ed30b3bea 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 ac803d715f9a0b56c58f68b1c496093fbee21d3d..5d2fadf4120dacca68f02be34f9206e4d0b78ffa 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 3582eeafa1a910f67c7fc1e7194b8aee21994754..b44890f3896acda7fb7e8726a5231784fb20b1ff 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 4e1aa83dc74d3db686ea7a3ae3c8ea442091cd1e..7a04bf3624c8cbb92370b2dca60cf45a3f15530c 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 f312b4e9725624b24c148066d9685f03d42e2a9f..87fd237577390d10b9da7c3e945d06035817739b 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
Binary files /dev/null and b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz differ
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
Binary files /dev/null and b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz differ
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 3ec07f62c5ce06923cbfba8158a68fa1c3cdc6f1..f33fd89a62ddbf02e94153268a1976ebaaacbc38 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 11b84a3251a97ea8539fe65034448bf77d3ebb6a..33c1da4fd3042df01fd8d15c6a57a32371a77a38 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 3582eeafa1a910f67c7fc1e7194b8aee21994754..b44890f3896acda7fb7e8726a5231784fb20b1ff 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 4e1aa83dc74d3db686ea7a3ae3c8ea442091cd1e..7a04bf3624c8cbb92370b2dca60cf45a3f15530c 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 dc90a362c06eab75ce1c892c6f693f67b817d413..2103e99c1370c81ba3f4679b81cf5b35dbf11d34 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 f1ad15f1c26d6966b93a903db504aad0effdd808..e0eda6f9eb7325eb5e4c0872fc7bd9501efd8d0e 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 f1ad15f1c26d6966b93a903db504aad0effdd808..e0eda6f9eb7325eb5e4c0872fc7bd9501efd8d0e 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 64223ec7b8ff667637b4205292da9e398ecc0f21..f9baf8b3e1dc5287f42a27d4debb5a7713d609d3 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 ba430bce29ba9052446feb77d30a6fe03581d684..81106f5ea4c8d3fc9ef41f563aca1199b62e00f1 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 63d54a7c3dbbdc49c061706b661442631467b6fc..f47969d4bfaa881eb006cc09b04861a5e0cdd694 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 0af0cd2da7bb8a8e4060940b500798ebf371d26b..47ad15660118d150a2b04cf9d0a736481f6cd8f0 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 c3b0586036e32efb9852c68b4a0ee0a1587cacec..e09e2739bd74209760e5464f8115fcb98a495b1d 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 02287f422b58ea20261ee3a90e0012076a3fb490..3729fc7648bb9d76cae6c48139d4b359b92e526c 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 1202013c58cab93c03b199125dc462a675f6acaa..d3c114226bcbad9cfd73fbe56db2662662c3a4b9 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 22fcdc05b527b3acf1e1ceafc408e09fdb93d6cd..2506a693af099682fa83ec08257f7e33b07498f8 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 cee67a8884fc3c99e57ec14aebeb157163b120a0..17678343e2d014de148a1de85f3af8b02e62f8d6 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 c74dee04a79938286079d4306832becc9d906a7c..0d7bbe9e603245b7f70fbfe67c89ca2132e03492 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 7e8fa0fb1aeae0af81fc1d362edca091275e8a5b..946d84ed62c397cfed6200bf9829658cc634d622 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 7415f2fc768aabfdde7fe7f4089984089b35b873..defca08b47fc2dc5c35ec6eb306ccaf2cebde967 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 452b5dd51c8e1284974dd9f03f466d10cdb81750..70366ec29f7aae0cb1cc50f62a3d186553321883 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 4ee30b518c6492f4f3673b5d986de57f13a2fb5c..faacf01f18278c3d94a67bc5d2f0e6428727548a 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 3b8cb649c2c5b2e996432647ae8a944ac35e9de2..7ea0ac7744adb48402cd7061e4ef780e8853c3df 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 02287f422b58ea20261ee3a90e0012076a3fb490..3729fc7648bb9d76cae6c48139d4b359b92e526c 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 696ba9cc7988e7447b0d9ed7a1010f2f75f44098..0f9b300499407a5717b95f4e25cac292f31b6bf6 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 ec8d1717d50aba095d49655c4509cd75692a659b..410a0a6f10301fb287d4b429143355dd6ccd526d 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 452b5dd51c8e1284974dd9f03f466d10cdb81750..70366ec29f7aae0cb1cc50f62a3d186553321883 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 4ee30b518c6492f4f3673b5d986de57f13a2fb5c..faacf01f18278c3d94a67bc5d2f0e6428727548a 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 3b8cb649c2c5b2e996432647ae8a944ac35e9de2..7ea0ac7744adb48402cd7061e4ef780e8853c3df 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 02287f422b58ea20261ee3a90e0012076a3fb490..3729fc7648bb9d76cae6c48139d4b359b92e526c 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 696ba9cc7988e7447b0d9ed7a1010f2f75f44098..0f9b300499407a5717b95f4e25cac292f31b6bf6 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 ec8d1717d50aba095d49655c4509cd75692a659b..410a0a6f10301fb287d4b429143355dd6ccd526d 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 f40309af2ed4b9d627ee189e8ae7f31bf41139af..bdebcf1ab45a891b0e5d3ace86f053118bc90d3b 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 4ee30b518c6492f4f3673b5d986de57f13a2fb5c..faacf01f18278c3d94a67bc5d2f0e6428727548a 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 3b8cb649c2c5b2e996432647ae8a944ac35e9de2..7ea0ac7744adb48402cd7061e4ef780e8853c3df 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 02287f422b58ea20261ee3a90e0012076a3fb490..3729fc7648bb9d76cae6c48139d4b359b92e526c 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 696ba9cc7988e7447b0d9ed7a1010f2f75f44098..0f9b300499407a5717b95f4e25cac292f31b6bf6 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 ec8d1717d50aba095d49655c4509cd75692a659b..410a0a6f10301fb287d4b429143355dd6ccd526d 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 f40309af2ed4b9d627ee189e8ae7f31bf41139af..bdebcf1ab45a891b0e5d3ace86f053118bc90d3b 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 4ee30b518c6492f4f3673b5d986de57f13a2fb5c..faacf01f18278c3d94a67bc5d2f0e6428727548a 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 3b8cb649c2c5b2e996432647ae8a944ac35e9de2..7ea0ac7744adb48402cd7061e4ef780e8853c3df 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 02287f422b58ea20261ee3a90e0012076a3fb490..3729fc7648bb9d76cae6c48139d4b359b92e526c 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 696ba9cc7988e7447b0d9ed7a1010f2f75f44098..0f9b300499407a5717b95f4e25cac292f31b6bf6 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 ec8d1717d50aba095d49655c4509cd75692a659b..410a0a6f10301fb287d4b429143355dd6ccd526d 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 f40309af2ed4b9d627ee189e8ae7f31bf41139af..bdebcf1ab45a891b0e5d3ace86f053118bc90d3b 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 4ee30b518c6492f4f3673b5d986de57f13a2fb5c..faacf01f18278c3d94a67bc5d2f0e6428727548a 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 3b8cb649c2c5b2e996432647ae8a944ac35e9de2..7ea0ac7744adb48402cd7061e4ef780e8853c3df 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 02287f422b58ea20261ee3a90e0012076a3fb490..3729fc7648bb9d76cae6c48139d4b359b92e526c 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 696ba9cc7988e7447b0d9ed7a1010f2f75f44098..0f9b300499407a5717b95f4e25cac292f31b6bf6 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 7ff571c6d130cf0424493bcc96a52251eedc746a..5ea2a373526325584a0f973a3f877a54cb9550cc 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 f40309af2ed4b9d627ee189e8ae7f31bf41139af..bdebcf1ab45a891b0e5d3ace86f053118bc90d3b 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 82e093ec03dc36c50fb1281de4b51bf917537199..5874c7a05098a59c8bbde9fba9a71d2c864580b6 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 0f2a6dea43a8d3d7f6a4390f09846759ce2f9dd0..4e10bfcacc9a04d67fed8c9f39ad5b759b0cc6dd 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 02287f422b58ea20261ee3a90e0012076a3fb490..3729fc7648bb9d76cae6c48139d4b359b92e526c 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 54f20e5253f0b6a6fbd838c1014ab2c65a3755ce..39d907fa792ebb1420f21ee1eb394ea6e2d6a137 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 8229dc2582c6e9bb23875290283fd2214c3de273..3b3ed7f998159e718871ab2f4e871818137d77c0 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 909068ce6c37c3bac87a16412d03a4f4829e2d43..d5d1e50d10fd857db73859b2d4ac38a5792ddc2e 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 510e4498db1c13c28b097181e2c2831c6a3e8c45..c0e6661c4b4fbd87655d60811595ee2c6cf89b8b 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 2b39cb45eb98a90493d27e77d97ee0df0eba0ae7..73d4778c9717901cdd274f26700c156444ae46ef 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 2a580ed9eb90ab5088bf09e7caf69fd7ba0ac138..aded32f19531e85eb3b940fae50024c6628844f3 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 6bea5720564eeb6cd3d9694e2caf5caa5f566c0a..36156e86145c247b6b99b8a34bd10a54fbbc1434 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 b6a5cdd65a85e8b7e6d5eed0a52b5c613972c1da..91bd115659620074043dee803bd3c8a878836ac5 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 df85d650551f1459601d21b25d6cde2aef1ddc26..b2319f1aa5f792c07230017abd1065833fea0103 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 ba430bce29ba9052446feb77d30a6fe03581d684..81106f5ea4c8d3fc9ef41f563aca1199b62e00f1 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 986a20eebeb97fe96e535bdd4b6ba3a632f1a4b3..1d9632b67461e66072dc478e30a1133c3801c202 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 6bea5720564eeb6cd3d9694e2caf5caa5f566c0a..36156e86145c247b6b99b8a34bd10a54fbbc1434 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 3152d483478da16c14e14741a926364eeafbf806..2a577a3c7d049aa1957070ceac618887a7f6db80 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 94befdfae818dce8965eafe81ffaab71f6e35753..baf41e0bb39de6cc40881d524c069d522a56c79b 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 fa41fd38c382e9e8a9b45e831422ebed57d97797..c74376aa3f2e38f16849ad34f969ed0a26cc33ee 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 d7383123a6a4cd8b8924813ec9144cded6e2bf9c..479dee58a2a7a158cd2a1ab59da93f4dc7438f02 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 63a607fe3ff4fb453f418822baa3668ffb9142f8..f76151df3d21e3255e920c3fd779f1ae3056cad9 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 f130490987bcf628f17a315903240224eca57679..0378faad394c2e6bbf6b7e2a7cd7c707329c16ca 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 df85d650551f1459601d21b25d6cde2aef1ddc26..b2319f1aa5f792c07230017abd1065833fea0103 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 5dc1b6e2d0a8b45a907636ccf429d8e183036b36..b2319f1aa5f792c07230017abd1065833fea0103 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 ef3e8c7b4b6b6b1979253b534cc30d07c0f63826..81106f5ea4c8d3fc9ef41f563aca1199b62e00f1 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 a30ce4ddb8c0709187beec070c39ff9db7977595..f6725a947bd2f35176920b3b47dc8b7b1d0e126e 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 3152d483478da16c14e14741a926364eeafbf806..2a577a3c7d049aa1957070ceac618887a7f6db80 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 bf6106677fc7d27dc3791d3ab7196a30e9a2c411..e083c1f7927dd39ce12e5ac96380f9e36677fbf9 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 bf6106677fc7d27dc3791d3ab7196a30e9a2c411..e083c1f7927dd39ce12e5ac96380f9e36677fbf9 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 e8f209f7c1ce1b7aacde6163358e2be901e1d96d..3142dc8a64e80e11f8bcfcd67f473d67cc1f5b23 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 cb36fb3b7dfaedd6e882b4e2afe3e553bb0955df..0b3ae667f024c82aebc27e7353fc0c3eb4e25aa4 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 ef3e8c7b4b6b6b1979253b534cc30d07c0f63826..81106f5ea4c8d3fc9ef41f563aca1199b62e00f1 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 96c64a2a1c9145b0573c148c95d84c02bf34ad47..a7103f6d6265a5a13a0a26d358067aa7969871b9 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 3152d483478da16c14e14741a926364eeafbf806..2a577a3c7d049aa1957070ceac618887a7f6db80 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 0c04649fe1b38c22a88d63a4fb65f147166cbaa9..72f44cb9eafff3d4ab28c5db7b88ddf3a85ee66f 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 813ad03d7930c652bd4f8f760ded0e305561c2bb..7eef6a06be0cbbbc8af2dcc10180d8684d30d225 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 7018c5eaa736966eedef0d3358cf514187949c90..de873558162e1e1cea020af091244cba613e96e7 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 62774a76104c171e959156b9bbbea564a9a0b3ba..cc69de4db59c903bb38692aa255095b04ff5a86b 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 468fd9778bab7aad0f7f082dfc8b49868749ffe6..0caad94498f1a17c9f63d58190d54301144d38dc 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 c90677dd56faefb3a99142061a847481f36e2c00..b86717bf8d7626ddae4c4d841f3498ab01367977 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 bb536c017ce4cef960716bc13d34c040d9f6d17a..40a4e9640d28f74370feee1d7cd01260e7248968 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 e2db3124d4d72d0925b097bd652e638b8e6f6d60..d2428017c40d148cdeba93484b4f9caecbd33c46 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 f4f1c444762ef3cf54207ef2f8630408f861e1d3..2258df9f4ffc8c8bcced5e1e575b2453e6ad60aa 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 92b06fe0a614ad67e3ec0bc5eb8bf48b52d524b9..6c087afc7da359bf29c332ddb2a14615d9b3f416 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 deeaf2f3dff70ccc44bee629d9085e3546cb7713..180c83d03e3abd3cd73b631339a9e6ab1dacd300 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 da58c047f11167b7accb35d26053883de19febc6..858f3882436160ca1ec0736dc512f5c58cdc9f3f 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 ef3e8c7b4b6b6b1979253b534cc30d07c0f63826..81106f5ea4c8d3fc9ef41f563aca1199b62e00f1 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 3693fa3dfe48cba3d696c111e4bc81c9c149c8d1..dc48e429db300c98414cae2c8ae69f75d87b5684 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 26d6b7f2a6c7f2db74d61eb3caf13bdece363db9..76fa077e7fbc8222cc4a1dcae0a193cf9e90dcd8 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 a2e32cc8e875c6b564836639b855423269be5945..3a2097df24a3dfe171bef1b119b51751e0fadab2 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 92e543ecce09e81181cdf7f910b3d5eb0371a2db..be3d97f20ac90d7a044e387c1a3ab4a9949bdf06 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 733980447c96d0d69caf4c3dd4c0ee98fca96bff..e60864d7f5dbebcf3324a24bdb85784f2b63d5a3 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 8673ec262542b8603bae066cf959998487b4af15..e7a73630a83f6442faa0e4ce3a234fcf94913fea 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 c3754beb680afbfeb3fc7c071f3e27f4ff7ed25d..6ca929b85518854cdadce3d0ce13500e21666b65 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 c78a74d48df8aad3cdcc7e7f9c399c0da33fd613..a9e6e6525d13817a8cee2469d5dae342b7718c1c 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 8ddd1fe903d3c4bd9293c1afe4e9dbafb8a8ffd5..ded24b94b605f04fe5d8e12d4d17c552382b5bf5 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 a1f8f8ffd5e3c2376a31e3a25f9f49fe036cfd3d..41c0ac39c6a22d42a6dee9577cd5a9bdfbe7a7be 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 65b89ea284aab65f36ced491ec6e46aa1bf980c0..0b43750be0c0bdb7ad5206f5698399a5e68c2232 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 df0c151c83fbb0b786b23d7a1a041adb93b54834..5c4f2ad6c66fd5f3987a6a7ffda136f3c647c3a3 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 35930b92037ebce04ce8e97605ce4f145759b445..c4837bb39f9ed2c9b51387613228f3ae2a12cd5b 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 af87b0880fb25609cc492b87363236bd3065e01e..6ad387f7159be44ddc74ebc5069ef0f2b48ec14d 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 2c45b1faae367a7c0eee3047750781a2cd35a9d6..12f879946c74a2d75abb7ec0f61400aa9459eaa1 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
         );
     }
 );