diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 3e4a041f90162e089b6ab0b29913534345f944ef..125f8706d10699ec1adf5d4e9d4e7d851ee89393 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -49,6 +49,11 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
+    autoPtr<incompressible::turbulenceModel> turbulence
+    (
+        incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    );
+
     const volScalarField nu(laminarTransport.nu());
 
     volScalarField mu
diff --git a/applications/solvers/multiphase/bubbleFoam/DDtU.H b/applications/solvers/multiphase/bubbleFoam/DDtU.H
index a5aad71f41d8edc7329544100469e871a514fb54..96b6a63a435d405e0d0bd4d5e80ef656b8e620d9 100644
--- a/applications/solvers/multiphase/bubbleFoam/DDtU.H
+++ b/applications/solvers/multiphase/bubbleFoam/DDtU.H
@@ -1,11 +1,11 @@
 {
-    DDtUa =
-        fvc::ddt(Ua)
-      + fvc::div(phia, Ua)
-      - fvc::div(phia)*Ua;
+    DDtU1 =
+        fvc::ddt(U1)
+      + fvc::div(phi1, U1)
+      - fvc::div(phi1)*U1;
 
-    DDtUb =
-        fvc::ddt(Ub)
-      + fvc::div(phib, Ub)
-      - fvc::div(phib)*Ub;
+    DDtU2 =
+        fvc::ddt(U2)
+      + fvc::div(phi2, U2)
+      - fvc::div(phi2)*U2;
 }
diff --git a/applications/solvers/multiphase/bubbleFoam/UEqns.H b/applications/solvers/multiphase/bubbleFoam/UEqns.H
index 3239df21cb3385c4c9a55eece0d8de26e67530bd..703f6b6d8d2a479d56ebf773309a432618460b9a 100644
--- a/applications/solvers/multiphase/bubbleFoam/UEqns.H
+++ b/applications/solvers/multiphase/bubbleFoam/UEqns.H
@@ -1,72 +1,74 @@
-fvVectorMatrix UaEqn(Ua, Ua.dimensions()*dimVol/dimTime);
-fvVectorMatrix UbEqn(Ub, Ub.dimensions()*dimVol/dimTime);
+fvVectorMatrix U1Eqn(U1, U1.dimensions()*dimVol/dimTime);
+fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
 
 {
-    volTensorField Rca(-nuEffa*(T(fvc::grad(Ua))));
-    Rca = Rca + (2.0/3.0)*sqr(Ct)*I*k - (2.0/3.0)*I*tr(Rca);
+    volTensorField Rc1(-nuEff1*(T(fvc::grad(U1))));
+    Rc1 = Rc1 + (2.0/3.0)*sqr(Ct)*I*k - (2.0/3.0)*I*tr(Rc1);
 
-    surfaceScalarField phiRa
+    surfaceScalarField phiR1
     (
-      - fvc::interpolate(nuEffa)
-       *mesh.magSf()*fvc::snGrad(alpha)/fvc::interpolate(alpha + scalar(0.001))
+      - fvc::interpolate(nuEff1)
+       *mesh.magSf()*fvc::snGrad(alpha1)
+       /fvc::interpolate(alpha1 + scalar(0.001))
     );
 
-    UaEqn =
+    U1Eqn =
     (
-        (scalar(1) + Cvm*rhob*beta/rhoa)*
+        (scalar(1) + Cvm*rho2*alpha2/rho1)*
         (
-            fvm::ddt(Ua)
-          + fvm::div(phia, Ua, "div(phia,Ua)")
-          - fvm::Sp(fvc::div(phia), Ua)
+            fvm::ddt(U1)
+          + fvm::div(phi1, U1, "div(phi1,U1)")
+          - fvm::Sp(fvc::div(phi1), U1)
         )
 
-      - fvm::laplacian(nuEffa, Ua)
-      + fvc::div(Rca)
+      - fvm::laplacian(nuEff1, U1)
+      + fvc::div(Rc1)
 
-      + fvm::div(phiRa, Ua, "div(phia,Ua)")
-      - fvm::Sp(fvc::div(phiRa), Ua)
-      + (fvc::grad(alpha)/(fvc::average(alpha) + scalar(0.001)) & Rca)
+      + fvm::div(phiR1, U1, "div(phi1,U1)")
+      - fvm::Sp(fvc::div(phiR1), U1)
+      + (fvc::grad(alpha1)/(fvc::average(alpha1) + scalar(0.001)) & Rc1)
      ==
     //  g                        // Buoyancy term transfered to p-equation
-      - fvm::Sp(beta/rhoa*dragCoef, Ua)
-    //+ beta/rhoa*dragCoef*Ub    // Explicit drag transfered to p-equation
-      - beta/rhoa*(liftCoeff - Cvm*rhob*DDtUb)
+      - fvm::Sp(alpha2/rho1*dragCoef, U1)
+    //+ alpha2/rho1*dragCoef*U2    // Explicit drag transfered to p-equation
+      - alpha2/rho1*(liftCoeff - Cvm*rho2*DDtU2)
     );
 
-    UaEqn.relax();
+    U1Eqn.relax();
 
 
-    volTensorField Rcb(-nuEffb*T(fvc::grad(Ub)));
-    Rcb = Rcb + (2.0/3.0)*I*k - (2.0/3.0)*I*tr(Rcb);
+    volTensorField Rc2(-nuEff2*T(fvc::grad(U2)));
+    Rc2 = Rc2 + (2.0/3.0)*I*k - (2.0/3.0)*I*tr(Rc2);
 
-    surfaceScalarField phiRb
+    surfaceScalarField phiR2
     (
-       - fvc::interpolate(nuEffb)
-        *mesh.magSf()*fvc::snGrad(beta)/fvc::interpolate(beta + scalar(0.001))
+       - fvc::interpolate(nuEff2)
+        *mesh.magSf()*fvc::snGrad(alpha2)
+        /fvc::interpolate(alpha2 + scalar(0.001))
     );
 
-    UbEqn =
+    U2Eqn =
     (
-        (scalar(1) + Cvm*rhob*alpha/rhob)*
+        (scalar(1) + Cvm*rho2*alpha1/rho2)*
         (
-            fvm::ddt(Ub)
-          + fvm::div(phib, Ub, "div(phib,Ub)")
-          - fvm::Sp(fvc::div(phib), Ub)
+            fvm::ddt(U2)
+          + fvm::div(phi2, U2, "div(phi2,U2)")
+          - fvm::Sp(fvc::div(phi2), U2)
         )
 
-      - fvm::laplacian(nuEffb, Ub)
-      + fvc::div(Rcb)
+      - fvm::laplacian(nuEff2, U2)
+      + fvc::div(Rc2)
 
-      + fvm::div(phiRb, Ub, "div(phib,Ub)")
-      - fvm::Sp(fvc::div(phiRb), Ub)
+      + fvm::div(phiR2, U2, "div(phi2,U2)")
+      - fvm::Sp(fvc::div(phiR2), U2)
 
-      + (fvc::grad(beta)/(fvc::average(beta) + scalar(0.001)) & Rcb)
+      + (fvc::grad(alpha2)/(fvc::average(alpha2) + scalar(0.001)) & Rc2)
      ==
     //  g                        // Buoyancy term transfered to p-equation
-      - fvm::Sp(alpha/rhob*dragCoef, Ub)
-    //+ alpha/rhob*dragCoef*Ua   // Explicit drag transfered to p-equation
-      + alpha/rhob*(liftCoeff + Cvm*rhob*DDtUa)
+      - fvm::Sp(alpha1/rho2*dragCoef, U2)
+    //+ alpha1/rho2*dragCoef*U1   // Explicit drag transfered to p-equation
+      + alpha1/rho2*(liftCoeff + Cvm*rho2*DDtU1)
     );
 
-    UbEqn.relax();
+    U2Eqn.relax();
 }
diff --git a/applications/solvers/multiphase/bubbleFoam/alphaEqn.H b/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
index 772008bc8936a17c98686777b9b769b248c560bf..0ecab0301603a5e8af8f452c8d10ce3157220dba 100644
--- a/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
@@ -1,7 +1,7 @@
 {
-    word scheme("div(phi,alpha)");
+    word scheme("div(phi,alpha1)");
 
-    surfaceScalarField phir(phia - phib);
+    surfaceScalarField phir(phi1 - phi2);
 
     Info<< "Max Ur Courant Number = "
         << (
@@ -15,42 +15,47 @@
 
     for (int acorr=0; acorr<nAlphaCorr; acorr++)
     {
-        fvScalarMatrix alphaEqn
+        fvScalarMatrix alpha1Eqn
         (
-             fvm::ddt(alpha)
-           + fvm::div(phi, alpha, scheme)
-           + fvm::div(-fvc::flux(-phir, beta, scheme), alpha, scheme)
+             fvm::ddt(alpha1)
+           + fvm::div(phi, alpha1, scheme)
+           + fvm::div(-fvc::flux(-phir, alpha2, scheme), alpha1, scheme)
         );
-        alphaEqn.relax();
-        alphaEqn.solve();
+        alpha1Eqn.relax();
+        alpha1Eqn.solve();
 
         /*
-        fvScalarMatrix betaEqn
+        fvScalarMatrix alpha2Eqn
         (
-              fvm::ddt(beta)
-            + fvm::div(phi, beta, scheme)
-            + fvm::div(-fvc::flux(phir, scalar(1) - beta, scheme), beta, scheme)
+            fvm::ddt(alpha2)
+          + fvm::div(phi, alpha2, scheme)
+          + fvm::div
+            (
+                -fvc::flux(phir, scalar(1) - alpha2, scheme),
+                alpha2,
+                scheme
+            )
         );
-        betaEqn.relax();
-        betaEqn.solve();
+        alpha2Eqn.relax();
+        alpha2Eqn.solve();
 
-        alpha =
+        alpha1 =
             0.5
            *(
                  scalar(1)
-               + sqr(scalar(1) - beta)
-               - sqr(scalar(1) - alpha)
+               + sqr(scalar(1) - alpha2)
+               - sqr(scalar(1) - alpha1)
             );
         */
 
-        beta = scalar(1) - alpha;
+        alpha2 = scalar(1) - alpha1;
     }
 
     Info<< "Dispersed phase volume fraction = "
-        << alpha.weightedAverage(mesh.V()).value()
-        << "  Min(alpha) = " << min(alpha).value()
-        << "  Max(alpha) = " << max(alpha).value()
+        << alpha1.weightedAverage(mesh.V()).value()
+        << "  Min(alpha1) = " << min(alpha1).value()
+        << "  Max(alpha1) = " << max(alpha1).value()
         << endl;
 }
 
-rho = alpha*rhoa + beta*rhob;
+rho = alpha1*rho1 + alpha2*rho2;
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index bef9c2b0ab75630bacb404f483b7c3796e7a5b68..53746755106ea7922b92512ca050075583c1030f 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
             if (pimple.turbCorr())
             {
                 #include "kEpsilon.H"
-                nuEffa = sqr(Ct)*nutb + nua;
+                nuEff1 = sqr(Ct)*nut2 + nu1;
             }
         }
 
diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H
index 9b1d9aa2ae2e092013f3e6a07414227887f505a4..9c33ee23a17b3b81a069ddf2c9b4124717da771d 100644
--- a/applications/solvers/multiphase/bubbleFoam/createFields.H
+++ b/applications/solvers/multiphase/bubbleFoam/createFields.H
@@ -1,9 +1,9 @@
-    Info<< "Reading field alpha\n" << endl;
-    volScalarField alpha
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "alpha",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -12,18 +12,18 @@
         mesh
     );
 
-    volScalarField beta
+    volScalarField alpha2
     (
         IOobject
         (
-            "beta",
+            "alpha2",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        scalar(1) - alpha
-        //,alpha.boundaryField().types()
+        scalar(1) - alpha1
+        //,alpha1.boundaryField().types()
     );
 
     Info<< "Reading field p\n" << endl;
@@ -40,12 +40,12 @@
         mesh
     );
 
-    Info<< "Reading field Ua\n" << endl;
-    volVectorField Ua
+    Info<< "Reading field U1\n" << endl;
+    volVectorField U1
     (
         IOobject
         (
-            "Ua",
+            "U1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -54,12 +54,12 @@
         mesh
     );
 
-    Info<< "Reading field Ub\n" << endl;
-    volVectorField Ub
+    Info<< "Reading field U2\n" << endl;
+    volVectorField U2
     (
         IOobject
         (
-            "Ub",
+            "U2",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -78,7 +78,7 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        alpha*Ua + beta*Ub
+        alpha1*U1 + alpha2*U2
     );
 
 
@@ -96,34 +96,34 @@
         )
     );
 
-    dimensionedScalar rhoa
+    dimensionedScalar rho1
     (
-        transportProperties.lookup("rhoa")
+        transportProperties.lookup("rho1")
     );
 
-    dimensionedScalar rhob
+    dimensionedScalar rho2
     (
-        transportProperties.lookup("rhob")
+        transportProperties.lookup("rho2")
     );
 
-    dimensionedScalar nua
+    dimensionedScalar nu1
     (
-        transportProperties.lookup("nua")
+        transportProperties.lookup("nu1")
     );
 
-    dimensionedScalar nub
+    dimensionedScalar nu2
     (
-        transportProperties.lookup("nub")
+        transportProperties.lookup("nu2")
     );
 
-    dimensionedScalar da
+    dimensionedScalar d1
     (
-        transportProperties.lookup("da")
+        transportProperties.lookup("d1")
     );
 
-    dimensionedScalar db
+    dimensionedScalar d2
     (
-        transportProperties.lookup("db")
+        transportProperties.lookup("d2")
     );
 
     dimensionedScalar Cvm
@@ -141,8 +141,8 @@
         transportProperties.lookup("Ct")
     );
 
-    #include "createPhia.H"
-    #include "createPhib.H"
+    #include "createPhi1.H"
+    #include "createPhi2.H"
 
     surfaceScalarField phi
     (
@@ -152,8 +152,8 @@
             runTime.timeName(),
             mesh
         ),
-        fvc::interpolate(alpha)*phia
-      + fvc::interpolate(beta)*phib
+        fvc::interpolate(alpha1)*phi1
+      + fvc::interpolate(alpha2)*phi2
     );
 
     volScalarField rho
@@ -164,25 +164,25 @@
             runTime.timeName(),
             mesh
         ),
-        alpha*rhoa + beta*rhob
+        alpha1*rho1 + alpha2*rho2
     );
 
     #include "createRASTurbulence.H"
 
-    Info<< "Calculating field DDtUa and DDtUb\n" << endl;
+    Info<< "Calculating field DDtU1 and DDtU2\n" << endl;
 
-    volVectorField DDtUa
+    volVectorField DDtU1
     (
-        fvc::ddt(Ua)
-      + fvc::div(phia, Ua)
-      - fvc::div(phia)*Ua
+        fvc::ddt(U1)
+      + fvc::div(phi1, U1)
+      - fvc::div(phi1)*U1
     );
 
-    volVectorField DDtUb
+    volVectorField DDtU2
     (
-        fvc::ddt(Ub)
-      + fvc::div(phib, Ub)
-      - fvc::div(phib)*Ub
+        fvc::ddt(U2)
+      + fvc::div(phi2, U2)
+      - fvc::div(phi2)*U2
     );
 
 
diff --git a/applications/solvers/multiphase/bubbleFoam/createPhia.H b/applications/solvers/multiphase/bubbleFoam/createPhi1.H
similarity index 63%
rename from applications/solvers/multiphase/bubbleFoam/createPhia.H
rename to applications/solvers/multiphase/bubbleFoam/createPhi1.H
index 2b2781d753aded5e07bd4407478e4efdac612e84..81bac77602b4ac7a0d9a98098ed8cb31b79c1e6e 100644
--- a/applications/solvers/multiphase/bubbleFoam/createPhia.H
+++ b/applications/solvers/multiphase/bubbleFoam/createPhi1.H
@@ -1,24 +1,24 @@
-    IOobject phiaHeader
+    IOobject phi1Header
     (
-        "phia",
+        "phi1",
         runTime.timeName(),
         mesh,
         IOobject::NO_READ
     );
 
-    autoPtr<surfaceScalarField> phiaPtr(NULL);
+    autoPtr<surfaceScalarField> phi1Ptr(NULL);
 
-    if (phiaHeader.headerOk())
+    if (phi1Header.headerOk())
     {
-        Info<< "Reading face flux field phia\n" << endl;
+        Info<< "Reading face flux field phi1\n" << endl;
 
-        phiaPtr.reset
+        phi1Ptr.reset
         (
             new surfaceScalarField
             (
                 IOobject
                 (
-                    "phia",
+                    "phi1",
                     runTime.timeName(),
                     mesh,
                     IOobject::MUST_READ,
@@ -30,38 +30,38 @@
     }
     else
     {
-        Info<< "Calculating face flux field phia\n" << endl;
+        Info<< "Calculating face flux field phi1\n" << endl;
 
         wordList phiTypes
         (
-            Ua.boundaryField().size(),
+            U1.boundaryField().size(),
             calculatedFvPatchScalarField::typeName
         );
 
-        forAll(Ua.boundaryField(), i)
+        forAll(U1.boundaryField(), i)
         {
-            if (isA<fixedValueFvPatchVectorField>(Ua.boundaryField()[i]))
+            if (isA<fixedValueFvPatchVectorField>(U1.boundaryField()[i]))
             {
                 phiTypes[i] = fixedValueFvPatchScalarField::typeName;
             }
         }
 
-        phiaPtr.reset
+        phi1Ptr.reset
         (
             new surfaceScalarField
             (
                 IOobject
                 (
-                    "phia",
+                    "phi1",
                     runTime.timeName(),
                     mesh,
                     IOobject::NO_READ,
                     IOobject::AUTO_WRITE
                 ),
-                fvc::interpolate(Ua) & mesh.Sf(),
+                fvc::interpolate(U1) & mesh.Sf(),
                 phiTypes
             )
         );
     }
 
-    surfaceScalarField& phia = phiaPtr();
+    surfaceScalarField& phi1 = phi1Ptr();
diff --git a/applications/solvers/multiphase/bubbleFoam/createPhib.H b/applications/solvers/multiphase/bubbleFoam/createPhi2.H
similarity index 63%
rename from applications/solvers/multiphase/bubbleFoam/createPhib.H
rename to applications/solvers/multiphase/bubbleFoam/createPhi2.H
index 84db6492b649bc05ed5f03642093b0487890029b..ebba6a3f6cbbc7d08a65f7900681cc16993260bc 100644
--- a/applications/solvers/multiphase/bubbleFoam/createPhib.H
+++ b/applications/solvers/multiphase/bubbleFoam/createPhi2.H
@@ -1,24 +1,24 @@
-    IOobject phibHeader
+    IOobject phi2Header
     (
-        "phib",
+        "phi2",
         runTime.timeName(),
         mesh,
         IOobject::NO_READ
     );
 
-    autoPtr<surfaceScalarField> phibPtr(NULL);
+    autoPtr<surfaceScalarField> phi2Ptr(NULL);
 
-    if (phibHeader.headerOk())
+    if (phi2Header.headerOk())
     {
-        Info<< "Reading face flux field phib\n" << endl;
+        Info<< "Reading face flux field phi2\n" << endl;
 
-        phibPtr.reset
+        phi2Ptr.reset
         (
             new surfaceScalarField
             (
                 IOobject
                 (
-                    "phib",
+                    "phi2",
                     runTime.timeName(),
                     mesh,
                     IOobject::MUST_READ,
@@ -30,38 +30,38 @@
     }
     else
     {
-        Info<< "Calculating face flux field phib\n" << endl;
+        Info<< "Calculating face flux field phi2\n" << endl;
 
         wordList phiTypes
         (
-            Ub.boundaryField().size(),
+            U2.boundaryField().size(),
             calculatedFvPatchScalarField::typeName
         );
 
-        forAll(Ub.boundaryField(), i)
+        forAll(U2.boundaryField(), i)
         {
-            if (isA<fixedValueFvPatchVectorField>(Ub.boundaryField()[i]))
+            if (isA<fixedValueFvPatchVectorField>(U2.boundaryField()[i]))
             {
                 phiTypes[i] = fixedValueFvPatchScalarField::typeName;
             }
         }
 
-        phibPtr.reset
+        phi2Ptr.reset
         (
             new surfaceScalarField
             (
                 IOobject
                 (
-                    "phib",
+                    "phi2",
                     runTime.timeName(),
                     mesh,
                     IOobject::NO_READ,
                     IOobject::AUTO_WRITE
                 ),
-                fvc::interpolate(Ub) & mesh.Sf(),
+                fvc::interpolate(U2) & mesh.Sf(),
                 phiTypes
             )
         );
     }
 
-    surfaceScalarField& phib = phibPtr();
+    surfaceScalarField& phi2 = phi2Ptr();
diff --git a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
index 1ef67b292e159c0b75283bda44d2af47043d85f0..bacd8356557a4b1ab9bce026ff00943b148659c8 100644
--- a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
+++ b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
@@ -51,21 +51,21 @@
         )
     );
 
-    dimensionedScalar alphak
+    dimensionedScalar alpha1k
     (
         dimensionedScalar::lookupOrAddToDict
         (
-            "alphak",
+            "alpha1k",
             kEpsilonDict,
             1.0
         )
     );
 
-    dimensionedScalar alphaEps
+    dimensionedScalar alpha1Eps
     (
         dimensionedScalar::lookupOrAddToDict
         (
-            "alphaEps",
+            "alpha1Eps",
             kEpsilonDict,
             0.76923
         )
@@ -135,12 +135,12 @@
     );
 
 
-    Info<< "Calculating field nutb\n" << endl;
-    volScalarField nutb
+    Info<< "Calculating field nut2\n" << endl;
+    volScalarField nut2
     (
         IOobject
         (
-            "nutb",
+            "nut2",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
@@ -149,30 +149,30 @@
         Cmu*sqr(k)/epsilon
     );
 
-    Info<< "Calculating field nuEffa\n" << endl;
-    volScalarField nuEffa
+    Info<< "Calculating field nuEff1\n" << endl;
+    volScalarField nuEff1
     (
         IOobject
         (
-            "nuEffa",
+            "nuEff1",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        sqr(Ct)*nutb + nua
+        sqr(Ct)*nut2 + nu1
     );
 
-    Info<< "Calculating field nuEffb\n" << endl;
-    volScalarField nuEffb
+    Info<< "Calculating field nuEff2\n" << endl;
+    volScalarField nuEff2
     (
         IOobject
         (
-            "nuEffb",
+            "nuEff2",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        nutb + nub
+        nut2 + nu2
     );
diff --git a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
index 05cfb08c9dd1144a447a555805d73c83a5e6bf9d..1340587ea319d321d712973749c5705438a2d382 100644
--- a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
+++ b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
@@ -5,9 +5,9 @@ if (turbulence)
         y.correct();
     }
 
-    tmp<volTensorField> tgradUb = fvc::grad(Ub);
-    volScalarField G(2*nutb*(tgradUb() && dev(symm(tgradUb()))));
-    tgradUb.clear();
+    tmp<volTensorField> tgradU2 = fvc::grad(U2);
+    volScalarField G(2*nut2*(tgradU2() && dev(symm(tgradU2()))));
+    tgradU2.clear();
 
     #include "wallFunctions.H"
 
@@ -15,11 +15,11 @@ if (turbulence)
     fvScalarMatrix epsEqn
     (
         fvm::ddt(epsilon)
-      + fvm::div(phib, epsilon)
-      - fvm::Sp(fvc::div(phib), epsilon)
+      + fvm::div(phi2, epsilon)
+      - fvm::Sp(fvc::div(phi2), epsilon)
       - fvm::laplacian
         (
-            alphaEps*nuEffb, epsilon,
+            alpha1Eps*nuEff2, epsilon,
             "laplacian(DepsilonEff,epsilon)"
         )
       ==
@@ -39,11 +39,11 @@ if (turbulence)
     fvScalarMatrix kEqn
     (
         fvm::ddt(k)
-      + fvm::div(phib, k)
-      - fvm::Sp(fvc::div(phib), k)
+      + fvm::div(phi2, k)
+      - fvm::Sp(fvc::div(phi2), k)
       - fvm::laplacian
         (
-            alphak*nuEffb, k,
+            alpha1k*nuEff2, k,
             "laplacian(DkEff,k)"
         )
       ==
@@ -56,9 +56,9 @@ if (turbulence)
     k.max(dimensionedScalar("zero", k.dimensions(), 1.0e-8));
 
     //- Re-calculate turbulence viscosity
-    nutb = Cmu*sqr(k)/epsilon;
+    nut2 = Cmu*sqr(k)/epsilon;
 
     #include "wallViscosity.H"
 }
 
-nuEffb = nutb + nub;
+nuEff2 = nut2 + nu2;
diff --git a/applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H b/applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H
index 5d00e3982059014c21b776ee8ca96859354d5e92..d2ebb75a2f71b542ecdfc3c7f8cb57c8a30d1f2b 100644
--- a/applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H
+++ b/applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H
@@ -1,23 +1,23 @@
-    volVectorField Ur(Ua - Ub);
+    volVectorField Ur(U1 - U2);
     volScalarField magUr(mag(Ur));
 
-    volScalarField CdaMagUr
+    volScalarField Cd1MagUr
     (
-        (24.0*nub/da)*(scalar(1) + 0.15*pow(da*magUr/nub, 0.687))
+        (24.0*nu2/d1)*(scalar(1) + 0.15*pow(d1*magUr/nu2, 0.687))
     );
 
-    volScalarField CdbMagUr
+    volScalarField Cd2MagUr
     (
-        (24.0*nua/db)*(scalar(1) + 0.15*pow(db*magUr/nua, 0.687))
+        (24.0*nu1/d2)*(scalar(1) + 0.15*pow(d2*magUr/nu1, 0.687))
     );
 
     volScalarField dragCoef
     (
         "Cd",
-        0.75*(beta*rhob*CdaMagUr/da + alpha*rhoa*CdbMagUr/db)
+        0.75*(alpha2*rho2*Cd1MagUr/d1 + alpha1*rho1*Cd2MagUr/d2)
     );
 
     volVectorField liftCoeff
     (
-        Cl*(beta*rhob + alpha*rhoa)*(Ur ^ fvc::curl(U))
+        Cl*(alpha2*rho2 + alpha1*rho1)*(Ur ^ fvc::curl(U))
     );
diff --git a/applications/solvers/multiphase/bubbleFoam/pEqn.H b/applications/solvers/multiphase/bubbleFoam/pEqn.H
index 268c2b4f0d7740e43ab11444596768db2ae66702..5f868f3da9d195881f09bd6e0256fe1a2bfcfb65 100644
--- a/applications/solvers/multiphase/bubbleFoam/pEqn.H
+++ b/applications/solvers/multiphase/bubbleFoam/pEqn.H
@@ -1,45 +1,45 @@
 {
-    surfaceScalarField alphaf(fvc::interpolate(alpha));
-    surfaceScalarField betaf(scalar(1) - alphaf);
+    surfaceScalarField alpha1f(fvc::interpolate(alpha1));
+    surfaceScalarField alpha2f(scalar(1) - alpha1f);
 
-    volScalarField rUaA(1.0/UaEqn.A());
-    volScalarField rUbA(1.0/UbEqn.A());
+    volScalarField rAU1(1.0/U1Eqn.A());
+    volScalarField rAU2(1.0/U2Eqn.A());
 
-    surfaceScalarField rUaAf(fvc::interpolate(rUaA));
-    surfaceScalarField rUbAf(fvc::interpolate(rUbA));
+    surfaceScalarField rAU1f(fvc::interpolate(rAU1));
+    surfaceScalarField rAU2f(fvc::interpolate(rAU2));
 
-    Ua = rUaA*UaEqn.H();
-    Ub = rUbA*UbEqn.H();
+    U1 = rAU1*U1Eqn.H();
+    U2 = rAU2*U2Eqn.H();
 
-    surfaceScalarField phiDraga
+    surfaceScalarField phiDrag1
     (
-        fvc::interpolate(beta/rhoa*dragCoef*rUaA)*phib + rUaAf*(g & mesh.Sf())
+        fvc::interpolate(alpha2/rho1*dragCoef*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
     );
-    surfaceScalarField phiDragb
+    surfaceScalarField phiDrag2
     (
-        fvc::interpolate(alpha/rhob*dragCoef*rUbA)*phia + rUbAf*(g & mesh.Sf())
+        fvc::interpolate(alpha1/rho2*dragCoef*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
     );
 
     forAll(p.boundaryField(), patchi)
     {
         if (isA<zeroGradientFvPatchScalarField>(p.boundaryField()[patchi]))
         {
-            phiDraga.boundaryField()[patchi] = 0.0;
-            phiDragb.boundaryField()[patchi] = 0.0;
+            phiDrag1.boundaryField()[patchi] = 0.0;
+            phiDrag2.boundaryField()[patchi] = 0.0;
         }
     }
 
-    phia = (fvc::interpolate(Ua) & mesh.Sf()) + fvc::ddtPhiCorr(rUaA, Ua, phia)
-        + phiDraga;
-    phib = (fvc::interpolate(Ub) & mesh.Sf()) + fvc::ddtPhiCorr(rUbA, Ub, phib)
-        + phiDragb;
+    phi1 = (fvc::interpolate(U1) & mesh.Sf()) + fvc::ddtPhiCorr(rAU1, U1, phi1)
+        + phiDrag1;
+    phi2 = (fvc::interpolate(U2) & mesh.Sf()) + fvc::ddtPhiCorr(rAU2, U2, phi2)
+        + phiDrag2;
 
-    phi = alphaf*phia + betaf*phib;
+    phi = alpha1f*phi1 + alpha2f*phi2;
 
     surfaceScalarField Dp
     (
         "(rho*(1|A(U)))",
-        alphaf*rUaAf/rhoa + betaf*rUbAf/rhob
+        alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
     );
 
     while (pimple.correctNonOrthogonal())
@@ -57,22 +57,22 @@
         {
             surfaceScalarField SfGradp(pEqn.flux()/Dp);
 
-            phia -= rUaAf*SfGradp/rhoa;
-            phib -= rUbAf*SfGradp/rhob;
-            phi = alphaf*phia + betaf*phib;
+            phi1 -= rAU1f*SfGradp/rho1;
+            phi2 -= rAU2f*SfGradp/rho2;
+            phi = alpha1f*phi1 + alpha2f*phi2;
 
             p.relax();
             SfGradp = pEqn.flux()/Dp;
 
-            Ua += (fvc::reconstruct(phiDraga - rUaAf*SfGradp/rhoa));
-            //Ua += rUaA*(fvc::reconstruct(phiDraga/rUaAf - SfGradp/rhoa));
-            Ua.correctBoundaryConditions();
+            U1 += (fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1));
+            //U1 += rAU1*(fvc::reconstruct(phiDrag1/rAU1f - SfGradp/rho1));
+            U1.correctBoundaryConditions();
 
-            Ub += (fvc::reconstruct(phiDragb - rUbAf*SfGradp/rhob));
-            //Ub += rUbA*(fvc::reconstruct(phiDragb/rUbAf - SfGradp/rhob));
-            Ub.correctBoundaryConditions();
+            U2 += (fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2));
+            //U2 += rAU2*(fvc::reconstruct(phiDrag2/rAU2f - SfGradp/rho2));
+            U2.correctBoundaryConditions();
 
-            U = alpha*Ua + beta*Ub;
+            U = alpha1*U1 + alpha2*U2;
         }
     }
 }
diff --git a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H
index e49ae0f66b7116a8070224a8914b83b4e4b0dbb6..c91cce9a00e2df5ca912a75a57a02d6f813d72c4 100644
--- a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H
+++ b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H
@@ -4,7 +4,7 @@
     scalar Cmu25 = ::pow(Cmu.value(), 0.25);
     scalar Cmu75 = ::pow(Cmu.value(), 0.75);
     scalar kappa_ = kappa.value();
-    scalar nub_ = nub.value();
+    scalar nu2_ = nu2.value();
 
     const fvPatchList& patches = mesh.boundary();
 
@@ -33,9 +33,9 @@
 
         if (isA<wallFvPatch>(currPatch))
         {
-            const scalarField& nutbw = nutb.boundaryField()[patchi];
+            const scalarField& nut2w = nut2.boundaryField()[patchi];
 
-            scalarField magFaceGradU(mag(Ub.boundaryField()[patchi].snGrad()));
+            scalarField magFaceGradU(mag(U2.boundaryField()[patchi].snGrad()));
 
             forAll(currPatch, facei)
             {
@@ -52,7 +52,7 @@
                     /(kappa_*y[patchi][facei]);
 
                 G[faceCelli] +=
-                    (nutbw[facei] + nub_)*magFaceGradU[facei]
+                    (nut2w[facei] + nu2_)*magFaceGradU[facei]
                    *Cmu25*::sqrt(k[faceCelli])
                    /(kappa_*y[patchi][facei]);
             }
diff --git a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H
index f34054f52555431f3469572a128ae33369d64c66..bd51ed7dd186037b72be8b7b1a9c34c22993851e 100644
--- a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H
+++ b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H
@@ -2,7 +2,7 @@
     scalar Cmu25 = ::pow(Cmu.value(), 0.25);
     scalar kappa_ = kappa.value();
     scalar E_ = E.value();
-    scalar nub_ = nub.value();
+    scalar nu2_ = nu2.value();
 
     const fvPatchList& patches = mesh.boundary();
 
@@ -12,7 +12,7 @@
 
         if (isA<wallFvPatch>(currPatch))
         {
-            scalarField& nutw = nutb.boundaryField()[patchi];
+            scalarField& nutw = nut2.boundaryField()[patchi];
 
             forAll(currPatch, facei)
             {
@@ -20,11 +20,11 @@
 
                 // calculate yPlus
                 scalar yPlus =
-                    Cmu25*y[patchi][facei]*::sqrt(k[faceCelli])/nub_;
+                    Cmu25*y[patchi][facei]*::sqrt(k[faceCelli])/nu2_;
 
                 if (yPlus > 11.6)
                 {
-                    nutw[facei] = nub_*(yPlus*kappa_/::log(E_*yPlus) -1);
+                    nutw[facei] = nu2_*(yPlus*kappa_/::log(E_*yPlus) -1);
                 }
                 else
                 {
diff --git a/applications/solvers/multiphase/bubbleFoam/write.H b/applications/solvers/multiphase/bubbleFoam/write.H
index fccfaae107fd88962a14ab1efd9acb251cf49779..303661beb6492a7e608f6d5e2385c824bf8dc55f 100644
--- a/applications/solvers/multiphase/bubbleFoam/write.H
+++ b/applications/solvers/multiphase/bubbleFoam/write.H
@@ -10,7 +10,7 @@
                 IOobject::NO_READ,
                 IOobject::AUTO_WRITE
             ),
-            Ua - Ub
+            U1 - U2
         );
 
         runTime.write();
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H
index 861590b235bf2577f2a0161350263d1a1f90159c..978e0d9969b2699c75cdaeecc97505b6063c9c39 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H
@@ -5,8 +5,8 @@
     fvScalarMatrix T1Eqn
     (
         fvm::ddt(alpha1, T1)
-      + fvm::div(alphaPhi1, T1)
-      - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), T1)
+      + fvm::div(alpha1Phi1, T1)
+      - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alpha1Phi1), T1)
       - fvm::laplacian(kByCp1, T1)
      ==
         heatTransferCoeff*T2/Cp1/rho1
@@ -17,8 +17,8 @@
     fvScalarMatrix T2Eqn
     (
         fvm::ddt(alpha2, T2)
-      + fvm::div(alphaPhi2, T2)
-      - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), T2)
+      + fvm::div(alpha1Phi2, T2)
+      - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alpha1Phi2), T2)
       - fvm::laplacian(kByCp2, T2)
      ==
         heatTransferCoeff*T1/Cp2/rho2
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
index a2802f85643967f77a802cf0d4fb81639e20559a..2990f22a66ca833486974e202a5716dfbf6e4ebc 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
@@ -8,7 +8,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         if (kineticTheory.on())
         {
             kineticTheory.solve(gradU1T);
-            nuEff1 = kineticTheory.mua()/rho1;
+            nuEff1 = kineticTheory.mu1()/rho1;
         }
         else // If not using kinetic theory is using Ct model
         {
@@ -31,8 +31,8 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
             (scalar(1) + Cvm*rho2*alpha2/rho1)*
             (
                 fvm::ddt(alpha1, U1)
-              + fvm::div(alphaPhi1, U1)
-              - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), U1)
+              + fvm::div(alpha1Phi1, U1)
+              - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alpha1Phi1), U1)
             )
           - fvm::laplacian(alpha1*nuEff1, U1)
           + fvc::div(alpha1*Rc1)
@@ -57,8 +57,8 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
             (scalar(1) + Cvm*rho2*alpha1/rho2)*
             (
                 fvm::ddt(alpha2, U2)
-              + fvm::div(alphaPhi2, U2)
-              - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), U2)
+              + fvm::div(alpha1Phi2, U2)
+              - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alpha1Phi2), U2)
             )
           - fvm::laplacian(alpha2*nuEff2, U2)
           + fvc::div(alpha2*Rc2)
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H
index d73364014978dcaeb9cb17290b68ebf1eca5bae7..85a9999095b3f480954cc147c6f9a2ac3092f434 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H
@@ -1,5 +1,5 @@
-surfaceScalarField alphaPhi1("alphaPhi1", phi1);
-surfaceScalarField alphaPhi2("alphaPhi2", phi2);
+surfaceScalarField alpha1Phi1("alpha1Phi1", phi1);
+surfaceScalarField alpha1Phi2("alpha1Phi2", phi2);
 
 {
     word scheme("div(phi,alpha1)");
@@ -68,17 +68,17 @@ surfaceScalarField alphaPhi2("alphaPhi2", phi2);
 
         if (g0.value() > 0.0)
         {
-            ppMagf = rU1Af*fvc::interpolate
+            ppMagf = rAU1f*fvc::interpolate
             (
                 (1.0/(rho1*(alpha1 + scalar(0.0001))))
-               *g0*min(exp(preAlphaExp*(alpha1 - alphaMax)), expMax)
+               *g0*min(exp(preAlphaExp*(alpha1 - alpha1Max)), expMax)
             );
 
             alpha1Eqn -= fvm::laplacian
             (
                 (fvc::interpolate(alpha1) + scalar(0.0001))*ppMagf,
                 alpha1,
-                "laplacian(alphaPpMag,alpha1)"
+                "laplacian(alpha1PpMag,alpha1)"
             );
         }
 
@@ -90,8 +90,8 @@ surfaceScalarField alphaPhi2("alphaPhi2", phi2);
 
         #include "packingLimiter.H"
 
-        alphaPhi1 = alpha1Eqn.flux();
-        alphaPhi2 = phi - alphaPhi1;
+        alpha1Phi1 = alpha1Eqn.flux();
+        alpha1Phi2 = phi - alpha1Phi1;
         alpha2 = scalar(1) - alpha1;
 
         Info<< "Dispersed phase volume fraction = "
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
index 4642e0133070557f6c919ebea1e2501f637d00f3..87bc71d809522a526a67651c253bbbb87e9573dd 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
@@ -324,11 +324,11 @@
         drag1
     );
 
-    surfaceScalarField rU1Af
+    surfaceScalarField rAU1f
     (
         IOobject
         (
-            "rU1Af",
+            "rAU1f",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createRASTurbulence.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createRASTurbulence.H
index b8c453d6454f0eea3515466dbf37d63a41073a14..8f05a1d1b373ccde772bfba4cee1b575574ae9f3 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createRASTurbulence.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createRASTurbulence.H
@@ -52,21 +52,21 @@
         )
     );
 
-    dimensionedScalar alphak
+    dimensionedScalar alpha1k
     (
         dimensionedScalar::lookupOrAddToDict
         (
-            "alphak",
+            "alpha1k",
             kEpsilonDict,
             1.0
         )
     );
 
-    dimensionedScalar alphaEps
+    dimensionedScalar alpha1Eps
     (
         dimensionedScalar::lookupOrAddToDict
         (
-            "alphaEps",
+            "alpha1Eps",
             kEpsilonDict,
             0.76923
         )
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
index 3d3246305073cf482ba64cb1b60a53c5c0410cbe..0f28f2330d3e3c440fd9879a8be40a199d2740b8 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
@@ -69,12 +69,12 @@ volScalarField heatTransferCoeff
             << exit(FatalError);
     }
 
-    volScalarField alphaCoeff
+    volScalarField alpha1Coeff
     (
         (alpha1 + minInterfaceAlpha)*(alpha2 + minInterfaceAlpha)
     );
-    dragCoeff *= alphaCoeff;
-    heatTransferCoeff *= alphaCoeff;
+    dragCoeff *= alpha1Coeff;
+    heatTransferCoeff *= alpha1Coeff;
 
     liftForce = Cl*(alpha1*rho1 + alpha2*rho2)*(Ur ^ fvc::curl(U));
 }
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
index 63349a73d4208036de57323e47fdbe31400a3f99..01e57a9e99d1661b2192b6ef45323f1b6b6857c1 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
@@ -49,12 +49,12 @@ namespace dragModels
 Foam::dragModels::Ergun::Ergun
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phase1, phase2)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -71,12 +71,12 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
 
     return
-        150.0*alpha_*phase2_.nu()*phase2_.rho()
-       /sqr(beta*phase1_.d())
-      + 1.75*phase2_.rho()*Ur/(beta*phase1_.d());
+        150.0*alpha1_*phase2_.nu()*phase2_.rho()
+       /sqr(alpha2*phase1_.d())
+      + 1.75*phase2_.rho()*Ur/(alpha2*phase1_.d());
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
index c9184a9665f09a606a492d95d056c66347667537..077f3a8f4a7efe4c4a4ebe96edeea6d5a84a10cf 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
@@ -68,7 +68,7 @@ public:
         Ergun
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index c0ff7880e42ba1161f1021d5058984d2850c120c..59e9a6bb00a5d15c3684c98f5f8600d47d2f17f3 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -49,12 +49,12 @@ namespace dragModels
 Foam::dragModels::Gibilaro::Gibilaro
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phase1, phase2)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -71,9 +71,9 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::Gibilaro::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
-    volScalarField bp(pow(beta, -2.8));
-    volScalarField Re(max(beta*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
+    volScalarField bp(pow(alpha2, -2.8));
+    volScalarField Re(max(alpha2*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
 
     return (17.3/Re + scalar(0.336))*phase2_.rho()*Ur*bp/phase1_.d();
 }
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
index 61c30c87da5174a4aa678a9bde674fb6d2fcc3cb..48a2c4fff3cc1a274a1777a6325ed5059cf507eb 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
@@ -68,7 +68,7 @@ public:
         Gibilaro
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index 3f659d44ec4cfbe0b2a65cd35545f137870c7f66..15a9b7ece46983a3587773fbe68f72fd61c5159a 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -49,12 +49,12 @@ namespace dragModels
 Foam::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phase1, phase2)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -71,9 +71,9 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::GidaspowErgunWenYu::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
     volScalarField d(phase1_.d());
-    volScalarField bp(pow(beta, -2.65));
+    volScalarField bp(pow(alpha2, -2.65));
     volScalarField Re(max(Ur*d/phase2_.nu(), scalar(1.0e-3)));
 
     volScalarField Cds
@@ -85,12 +85,12 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::GidaspowErgunWenYu::K
     // Wen and Yu (1966)
     return
     (
-        pos(beta - 0.8)
+        pos(alpha2 - 0.8)
        *(0.75*Cds*phase2_.rho()*Ur*bp/d)
-      + neg(beta - 0.8)
+      + neg(alpha2 - 0.8)
        *(
-           150.0*alpha_*phase2_.nu()*phase2_.rho()/(sqr(beta*d))
-         + 1.75*phase2_.rho()*Ur/(beta*d)
+           150.0*alpha1_*phase2_.nu()*phase2_.rho()/(sqr(alpha2*d))
+         + 1.75*phase2_.rho()*Ur/(alpha2*d)
         )
     );
 }
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
index ad1dd399d9e4bb8231bd37bd888b4de1e4293570..d893bdb615af7964acadcb25756dc20ed657096c 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
@@ -66,7 +66,7 @@ public:
         GidaspowErgunWenYu
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index 0a624c6b0a2a8a7bb8e8f4ba552b83eb13b3b967..3987b794e1d7982fae0be4bd7cb37e85bca277b8 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -49,12 +49,12 @@ namespace dragModels
 Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phase1, phase2)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -71,10 +71,10 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::GidaspowSchillerNaumann::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1e-6)));
-    volScalarField bp(pow(beta, -2.65));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1e-6)));
+    volScalarField bp(pow(alpha2, -2.65));
 
-    volScalarField Re(max(beta*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
+    volScalarField Re(max(alpha2*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
     volScalarField Cds
     (
         neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
index 8938085fa5e4117a645f570269a0529d27ea5f3d..67d398237d6f4fc70cd338f60b6f506c9be43bad 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
@@ -75,7 +75,7 @@ public:
         GidaspowSchillerNaumann
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index f68e5379d2403e64ead7aadf0ac369d5bfa5ed8d..bd2275b0f032dabdcb5b4439032d6ec94d4fe460 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -49,12 +49,12 @@ namespace dragModels
 Foam::dragModels::SchillerNaumann::SchillerNaumann
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phase1, phase2)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
index 3c562ccb5d858764fc373866c7022d8aecdbdba6..80a4330085839173dabc5f643c0a8eee6f479e21 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
@@ -64,7 +64,7 @@ public:
         SchillerNaumann
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index 541868cf870c581b0a50e8bf44e29e7593e11bc8..d033b669b1ef678b6e81a92692c7fd9f35bbf6ad 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -49,12 +49,12 @@ namespace dragModels
 Foam::dragModels::SyamlalOBrien::SyamlalOBrien
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phase1, phase2)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -71,12 +71,12 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::SyamlalOBrien::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
-    volScalarField A(pow(beta, 4.14));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
+    volScalarField A(pow(alpha2, 4.14));
     volScalarField B
     (
-        neg(beta - 0.85)*(0.8*pow(beta, 1.28))
-      + pos(beta - 0.85)*(pow(beta, 2.65))
+        neg(alpha2 - 0.85)*(0.8*pow(alpha2, 1.28))
+      + pos(alpha2 - 0.85)*(pow(alpha2, 2.65))
     );
 
     volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
index af8dd29451efbc5d6aeb121c7b259a18866c606e..711f5b62292299a5ce842f204b116664c7054b15 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
@@ -67,7 +67,7 @@ public:
         SyamlalOBrien
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
index bf279a3990a0d065d2a680896bb78e2212ef9f0b..d8b00d0993b6b3eb836d900df907f24438109c28 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
@@ -49,12 +49,12 @@ namespace dragModels
 Foam::dragModels::WenYu::WenYu
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phase1, phase2)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -71,8 +71,8 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::WenYu::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
-    volScalarField bp(pow(beta, -2.65));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
+    volScalarField bp(pow(alpha2, -2.65));
 
     volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
     volScalarField Cds
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
index fe99de602a444cb11abe89e5d3351d1202044795..a38fca5d540d8c3e9bba00babd73899024ed5a00 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
@@ -78,7 +78,7 @@ public:
         WenYu
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
index ca700ba16f276c4608b0d6310de7797d406ce6a2..a305eacda8a55c0764efbee3577245241b1f406b 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
@@ -39,13 +39,13 @@ namespace Foam
 Foam::dragModel::dragModel
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
     interfaceDict_(interfaceDict),
-    alpha_(alpha),
+    alpha1_(alpha1),
     phase1_(phase1),
     phase2_(phase2)
 {}
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index 97c9d455f12810b35b053f257694e1ff0d79c073..54dc0ec3c608026178368bf94644042d625f4342 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -55,7 +55,7 @@ protected:
     // Protected data
 
         const dictionary& interfaceDict_;
-        const volScalarField& alpha_;
+        const volScalarField& alpha1_;
         const phaseModel& phase1_;
         const phaseModel& phase2_;
 
@@ -75,11 +75,11 @@ public:
             dictionary,
             (
                 const dictionary& interfaceDict,
-                const volScalarField& alpha,
+                const volScalarField& alpha1,
                 const phaseModel& phase1,
                 const phaseModel& phase2
             ),
-            (interfaceDict, alpha, phase1, phase2)
+            (interfaceDict, alpha1, phase1, phase2)
         );
 
 
@@ -88,7 +88,7 @@ public:
         dragModel
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
@@ -103,7 +103,7 @@ public:
         static autoPtr<dragModel> New
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
@@ -112,12 +112,13 @@ public:
     // Member Functions
 
         //- the dragfunction K used in the momentum eq.
-        //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
-        //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
+        //    ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(U1-U2)
+        //    ddt(alpha2*rho2*U2) + ...  = ... alpha1*alpha2*K*(U2-U1)
         // ********************************** NB! *****************************
-        // for numerical reasons alpha and beta has been
+        // for numerical reasons alpha1 and alpha2 has been
         // extracted from the dragFunction K,
-        // so you MUST divide K by alpha*beta when implemnting the drag function
+        // so you MUST divide K by alpha1*alpha2 when implemnting the drag
+        // function
         // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index 3f340636baa4ac08ae0cabce36e825557449e569..a7a8d74ae3afa66b20f16f8aed8a97d57f360aa5 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -30,7 +30,7 @@ License
 Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
@@ -58,7 +58,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
             << exit(FatalError);
     }
 
-    return cstrIter()(interfaceDict, alpha, phase1, phase2);
+    return cstrIter()(interfaceDict, alpha1, phase1, phase2);
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index cc53c67d763ec109f9d7dc31ad83c37046d84635..2d2e4f5646ff3507e55fdac0340ac1a76500b696 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -49,12 +49,12 @@ namespace heatTransferModels
 Foam::heatTransferModels::RanzMarshall::RanzMarshall
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    heatTransferModel(interfaceDict, alpha, phase1, phase2)
+    heatTransferModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
index 0013e3f1d17703e778586fef8b110a4d45df754c..cfcb0ba560aeaf1e6e31adf93e8d8adeb62e5ca8 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
@@ -64,7 +64,7 @@ public:
         RanzMarshall
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index 810adfe4159055804ecebbbd9df0d2725447eb6b..586e93132280c0a41a187cc852f81ddc067ffe0f 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
@@ -39,13 +39,13 @@ namespace Foam
 Foam::heatTransferModel::heatTransferModel
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
     interfaceDict_(interfaceDict),
-    alpha_(alpha),
+    alpha1_(alpha1),
     phase1_(phase1),
     phase2_(phase2)
 {}
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index f83a03804b088836ed24352039d524640538f376..8006177c5a1470f083ef6a1752751b2759b0fa19 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -55,7 +55,7 @@ protected:
     // Protected data
 
         const dictionary& interfaceDict_;
-        const volScalarField& alpha_;
+        const volScalarField& alpha1_;
         const phaseModel& phase1_;
         const phaseModel& phase2_;
 
@@ -75,11 +75,11 @@ public:
             dictionary,
             (
                 const dictionary& interfaceDict,
-                const volScalarField& alpha,
+                const volScalarField& alpha1,
                 const phaseModel& phase1,
                 const phaseModel& phase2
             ),
-            (interfaceDict, alpha, phase1, phase2)
+            (interfaceDict, alpha1, phase1, phase2)
         );
 
 
@@ -88,7 +88,7 @@ public:
         heatTransferModel
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
@@ -103,7 +103,7 @@ public:
         static autoPtr<heatTransferModel> New
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
@@ -112,12 +112,12 @@ public:
     // Member Functions
 
         //- the heat-transfer function K used in the enthalpy eq.
-        //    ddt(alpha*rhoa*ha) + ... = ... alpha*beta*K*(Ta - Tb)
-        //    ddt(beta*rhob*hb) + ...  = ... alpha*beta*K*(Tb - Ta)
+        //    ddt(alpha1*rho1*ha) + ... = ... alpha1*alpha2*K*(Ta - Tb)
+        //    ddt(alpha2*rho2*hb) + ...  = ... alpha1*alpha2*K*(Tb - Ta)
         // ********************************** NB!*****************************
-        // for numerical reasons alpha and beta has been
+        // for numerical reasons alpha1 and alpha2 has been
         // extracted from the heat-transfer function K,
-        // so you MUST divide K by alpha*beta when implementing the
+        // so you MUST divide K by alpha1*alpha2 when implementing the
         // heat-transfer function
         // ********************************** NB!*****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index b14f3821bfef062f2616f5d4ced8325053667560..2e9a2b10ed95f93811d1481c0e160c207ec15e5b 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -30,7 +30,7 @@ License
 Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
@@ -58,7 +58,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
             << exit(FatalError);
     }
 
-    return cstrIter()(interfaceDict, alpha, phase1, phase2);
+    return cstrIter()(interfaceDict, alpha1, phase1, phase2);
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
index 0a2ac036b3a05b778ca0fc763ca5ed5981aaf26a..b1169797dc861b1a301a2a91cf9c1381d08807bd 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
@@ -70,21 +70,21 @@ Foam::kineticTheoryModels::conductivityModels::Gidaspow::~Gidaspow()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::conductivityModels::Gidaspow::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*g0*0.5*(1.0 + e)*sqr(alpha)
-      + (15.0/16.0)*sqrtPi*alpha
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*g0*0.5*(1.0 + e)*sqr(alpha1)
+      + (15.0/16.0)*sqrtPi*alpha1
       + (25.0/64.0)*sqrtPi/((1.0 + e)*g0)
     );
 }
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
index b6c55696ce5a84954a2fb661be0ce8f561cd81ff..3f36f18bb307c1082252426a245992614dbba0bd 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
@@ -74,10 +74,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index cc9ac56cfdf9626ee48617df84484de9320dadf9..3d89e77293d6ccec250dfb14b2d9009a6b3bf99c 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -73,10 +73,10 @@ Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
@@ -85,15 +85,15 @@ Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::kappa
 
     volScalarField lamda
     (
-        scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_
+        scalar(1) + da/(6.0*sqrt(2.0)*(alpha1 + scalar(1.0e-5)))/L_
     );
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha)
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha1)
        /(49.0/16.0 - 33.0*e/16.0)
-      + (15.0/16.0)*sqrtPi*alpha*(0.5*sqr(e) + 0.25*e - 0.75 + lamda)
+      + (15.0/16.0)*sqrtPi*alpha1*(0.5*sqr(e) + 0.25*e - 0.75 + lamda)
        /((49.0/16.0 - 33.0*e/16.0)*lamda)
       + (25.0/64.0)*sqrtPi
        /((1.0 + e)*(49.0/16.0 - 33.0*e/16.0)*lamda*g0)
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
index 3a635724b3de259d047daf3bb288a15331c5ce7b..2ef3d8c42c2e821c2694e971798d308ed9f0113d 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
@@ -79,10 +79,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
index 4d99b686a4909e47fed2459ed497247aff78cb70..ef04fe87dd0b87042de13c7f852aeeeb5409068f 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
@@ -70,22 +70,22 @@ Foam::kineticTheoryModels::conductivityModels::Syamlal::~Syamlal()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::conductivityModels::Syamlal::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*g0*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha)
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*g0*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha1)
        /(49.0/16.0 - 33.0*e/16.0)
-      + (15.0/32.0)*sqrtPi*alpha/(49.0/16.0 - 33.0*e/16.0)
+      + (15.0/32.0)*sqrtPi*alpha1/(49.0/16.0 - 33.0*e/16.0)
     );
 }
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
index e25c8f51e6cd8ac35ef4e5cc88616610e817e363..032ce1406777fa2c1b6e8149aadb4e6af88f8459 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
@@ -74,10 +74,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 4f872bbd3ccde35520c730045ba536c5564af550..4fc3a59ac88a9e25a361421b418de1c3a7097ca0 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -106,10 +106,10 @@ public:
 
         virtual tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const = 0;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 15c820874a5e59dc6d2dfda622e91f819ad1ce7d..bef0d689b3819c9355e13442b850bf9a34465d44 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -72,9 +72,9 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::
 frictionalPressure
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -82,8 +82,8 @@ frictionalPressure
 {
 
     return
-        Fr*pow(max(alpha - alphaMinFriction, scalar(0)), eta)
-       /pow(max(alphaMax - alpha, scalar(5.0e-2)), p);
+        Fr*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta)
+       /pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p);
 }
 
 
@@ -91,9 +91,9 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::
 frictionalPressurePrime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -101,17 +101,18 @@ frictionalPressurePrime
 {
     return Fr*
     (
-        eta*pow(max(alpha - alphaMinFriction, scalar(0)), eta - 1.0)
-       *(alphaMax-alpha) + p*pow(max(alpha - alphaMinFriction, scalar(0)), eta)
-    )/pow(max(alphaMax - alpha, scalar(5.0e-2)), p + 1.0);
+        eta*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta - 1.0)
+       *(alpha1Max-alpha1)
+      + p*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta)
+    )/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p + 1.0);
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::muf
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max,
     const volScalarField& pf,
     const volSymmTensorField& D,
     const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
index ace67f54d185449178d63700c14059405e10db7a..85a0c1431a308ef4dcaf401bc419ce2543a500bd 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
@@ -74,9 +74,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -84,9 +84,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -94,8 +94,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index d458f07b754218cb44de74b2cbe483b68626f188..6c855527fb93c3cefcad260a12d0e7a10a71054e 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -70,9 +70,9 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::
 frictionalPressure
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -80,7 +80,7 @@ frictionalPressure
 {
     return
         dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24)
-       *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 10.0);
+       *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 10.0);
 }
 
 
@@ -88,9 +88,9 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::
 frictionalPressurePrime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -98,15 +98,15 @@ frictionalPressurePrime
 {
     return
         dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25)
-       *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 9.0);
+       *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 9.0);
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max,
     const volScalarField& pf,
     const volSymmTensorField& D,
     const dimensionedScalar& phi
@@ -123,10 +123,10 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
             IOobject
             (
                 "muf",
-                alpha.mesh().time().timeName(),
-                alpha.mesh()
+                alpha1.mesh().time().timeName(),
+                alpha1.mesh()
             ),
-            alpha.mesh(),
+            alpha1.mesh(),
             dimensionedScalar("muf", dimensionSet(1, -1, -1, 0, 0), 0.0)
         )
     );
@@ -135,7 +135,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
 
     forAll (D, celli)
     {
-        if (alpha[celli] > alphaMax.value() - 5e-2)
+        if (alpha1[celli] > alpha1Max.value() - 5e-2)
         {
             muff[celli] =
                 0.5*pf[celli]*sin(phi.value())
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
index ec517774a1ef80c867fadbd05425f6cd695d41d3..00d2fe2227b20d69f6e5b03b72204ffeb067459a 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
@@ -74,9 +74,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -84,9 +84,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& n,
             const dimensionedScalar& p
@@ -94,8 +94,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index aa5983d5d23a32853349887e2e96f5fc958de90d..a7843785de948945342083788aae2294b201f6c1 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -106,9 +106,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -116,9 +116,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alphaf,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1f,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -126,8 +126,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
index 2655267134f22b080cbcfd5f93ec1cd6c85b7fda..3bf8a466334af443d0adfdb799d849403773d768 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
@@ -69,14 +69,14 @@ Foam::kineticTheoryModels::granularPressureModels::Lun::~Lun()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::granularPressureModels::Lun::granularPressureCoeff
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
 
-    return rhoa*alpha*(1.0 + 2.0*(1.0 + e)*alpha*g0);
+    return rho1*alpha1*(1.0 + 2.0*(1.0 + e)*alpha1*g0);
 }
 
 
@@ -84,14 +84,14 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::granularPressureModels::Lun::
 granularPressureCoeffPrime
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
     const volScalarField& g0prime,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
-    return rhoa*(1.0 + alpha*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha));
+    return rho1*(1.0 + alpha1*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha1));
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
index 81a58d409a902eea6a78e5255e286183d5b1b98d..056a42d40b3ac8fc0fc883c9d99de538df55c197 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
@@ -74,18 +74,18 @@ public:
 
         tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 
         tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 };
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
index 34ba15cbcf4aff0cf53be15ac19c0b572721dcb0..4c7e58bb6626968c0d80121e6bfc66bf4e92f1ae 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
@@ -72,14 +72,14 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::granularPressureModels::SyamlalRogersOBrien::
 granularPressureCoeff
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
 
-    return 2.0*rhoa*(1.0 + e)*sqr(alpha)*g0;
+    return 2.0*rho1*(1.0 + e)*sqr(alpha1)*g0;
 }
 
 
@@ -87,14 +87,14 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::granularPressureModels::SyamlalRogersOBrien::
 granularPressureCoeffPrime
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
     const volScalarField& g0prime,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
-    return rhoa*alpha*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha);
+    return rho1*alpha1*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha1);
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
index c328481a1c526a78ee8daac9dcf84d4e2899a34b..b41f52e6b02d3413ea249a89b9ac74933f44a333 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
@@ -74,18 +74,18 @@ public:
 
         tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 
         tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 };
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 1ae4da2e8e4e95b927fe2dced000a7820e71716f..099dbceaf56484a3164161ab06f2a05a89dfe65d 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -107,19 +107,19 @@ public:
         //- Granular pressure coefficient
         virtual tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const = 0;
 
         //- Derivative of the granular pressure coefficient
         virtual tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const = 0;
 };
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index d4513e922f9af75c2c9d6570f0f24d39c7e2cb7f..8e04184e012ebd82bfcf762456541a015fc4a3d9 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -33,28 +33,28 @@ License
 Foam::kineticTheoryModel::kineticTheoryModel
 (
     const Foam::phaseModel& phase1,
-    const Foam::volVectorField& Ub,
-    const Foam::volScalarField& alpha,
+    const Foam::volVectorField& U2,
+    const Foam::volScalarField& alpha1,
     const Foam::dragModel& draga
 )
 :
     phase1_(phase1),
-    Ua_(phase1.U()),
-    Ub_(Ub),
-    alpha_(alpha),
-    phia_(phase1.phi()),
+    U1_(phase1.U()),
+    U2_(U2),
+    alpha1_(alpha1),
+    phi1_(phase1.phi()),
     draga_(draga),
 
-    rhoa_(phase1.rho()),
-    nua_(phase1.nu()),
+    rho1_(phase1.rho()),
+    nu1_(phase1.nu()),
 
     kineticTheoryProperties_
     (
         IOobject
         (
             "kineticTheoryProperties",
-            Ua_.time().constant(),
-            Ua_.mesh(),
+            U1_.time().constant(),
+            U1_.mesh(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )
@@ -98,8 +98,8 @@ Foam::kineticTheoryModel::kineticTheoryModel
         )
     ),
     e_(kineticTheoryProperties_.lookup("e")),
-    alphaMax_(kineticTheoryProperties_.lookup("alphaMax")),
-    alphaMinFriction_(kineticTheoryProperties_.lookup("alphaMinFriction")),
+    alpha1Max_(kineticTheoryProperties_.lookup("alpha1Max")),
+    alpha1MinFriction_(kineticTheoryProperties_.lookup("alpha1MinFriction")),
     Fr_(kineticTheoryProperties_.lookup("Fr")),
     eta_(kineticTheoryProperties_.lookup("eta")),
     p_(kineticTheoryProperties_.lookup("p")),
@@ -109,24 +109,24 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "Theta",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh()
+        U1_.mesh()
     ),
-    mua_
+    mu1_
     (
         IOobject
         (
-            "mua",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            "mu1",
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     lambda_
@@ -134,12 +134,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "lambda",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     pa_
@@ -147,12 +147,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "pa",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -2, 0, 0), 0.0)
     ),
     kappa_
@@ -160,12 +160,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "kappa",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     gs0_
@@ -173,12 +173,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "gs0",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 1.0)
     )
 {}
@@ -192,7 +192,7 @@ Foam::kineticTheoryModel::~kineticTheoryModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
+void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
 {
     if (!kineticTheory_)
     {
@@ -203,24 +203,24 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
 
     volScalarField da_(phase1_.d());
 
-    surfaceScalarField phi(1.5*rhoa_*phia_*fvc::interpolate(alpha_));
+    surfaceScalarField phi(1.5*rho1_*phi1_*fvc::interpolate(alpha1_));
 
-    volTensorField dU(gradUat.T());    //fvc::grad(Ua_);
+    volTensorField dU(gradU1t.T());    //fvc::grad(U1_);
     volSymmTensorField D(symm(dU));
 
-    // NB, drag = K*alpha*beta,
-    // (the alpha and beta has been extracted from the drag function for
+    // NB, drag = K*alpha1*alpha2,
+    // (the alpha1 and alpha2 has been extracted from the drag function for
     // numerical reasons)
-    volScalarField Ur(mag(Ua_ - Ub_));
-    volScalarField betaPrim(alpha_*(1.0 - alpha_)*draga_.K(Ur));
+    volScalarField Ur(mag(U1_ - U2_));
+    volScalarField alpha2Prim(alpha1_*(1.0 - alpha1_)*draga_.K(Ur));
 
     // Calculating the radial distribution function (solid volume fraction is
     //  limited close to the packing limit, but this needs improvements)
     //  The solution is higly unstable close to the packing limit.
     gs0_ = radialModel_->g0
     (
-        min(max(alpha_, scalar(1e-6)), alphaMax_ - 0.01),
-        alphaMax_
+        min(max(alpha1_, scalar(1e-6)), alpha1Max_ - 0.01),
+        alpha1Max_
     );
 
     // particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45)
@@ -228,18 +228,18 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         granularPressureModel_->granularPressureCoeff
         (
-            alpha_,
+            alpha1_,
             gs0_,
-            rhoa_,
+            rho1_,
             e_
         )
     );
 
     // 'thermal' conductivity (Table 3.3, p. 49)
-    kappa_ = conductivityModel_->kappa(alpha_, Theta_, gs0_, rhoa_, da_, e_);
+    kappa_ = conductivityModel_->kappa(alpha1_, Theta_, gs0_, rho1_, da_, e_);
 
     // particle viscosity (Table 3.2, p.47)
-    mua_ = viscosityModel_->mua(alpha_, Theta_, gs0_, rhoa_, da_, e_);
+    mu1_ = viscosityModel_->mu1(alpha1_, Theta_, gs0_, rho1_, da_, e_);
 
     dimensionedScalar Tsmall
     (
@@ -254,22 +254,22 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     // dissipation (Eq. 3.24, p.50)
     volScalarField gammaCoeff
     (
-        12.0*(1.0 - sqr(e_))*sqr(alpha_)*rhoa_*gs0_*(1.0/da_)*ThetaSqrt/sqrtPi
+        12.0*(1.0 - sqr(e_))*sqr(alpha1_)*rho1_*gs0_*(1.0/da_)*ThetaSqrt/sqrtPi
     );
 
     // Eq. 3.25, p. 50 Js = J1 - J2
-    volScalarField J1(3.0*betaPrim);
+    volScalarField J1(3.0*alpha2Prim);
     volScalarField J2
     (
-        0.25*sqr(betaPrim)*da_*sqr(Ur)
-       /(max(alpha_, scalar(1e-6))*rhoa_*sqrtPi*(ThetaSqrt + TsmallSqrt))
+        0.25*sqr(alpha2Prim)*da_*sqr(Ur)
+       /(max(alpha1_, scalar(1e-6))*rho1_*sqrtPi*(ThetaSqrt + TsmallSqrt))
     );
 
     // bulk viscosity  p. 45 (Lun et al. 1984).
-    lambda_ = (4.0/3.0)*sqr(alpha_)*rhoa_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
+    lambda_ = (4.0/3.0)*sqr(alpha1_)*rho1_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
 
     // stress tensor, Definitions, Table 3.1, p. 43
-    volSymmTensorField tau(2.0*mua_*D + (lambda_ - (2.0/3.0)*mua_)*tr(D)*I);
+    volSymmTensorField tau(2.0*mu1_*D + (lambda_ - (2.0/3.0)*mu1_)*tr(D)*I);
 
     if (!equilibrium_)
     {
@@ -279,7 +279,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
         // wrong sign infront of laplacian
         fvScalarMatrix ThetaEqn
         (
-            fvm::ddt(1.5*alpha_*rhoa_, Theta_)
+            fvm::ddt(1.5*alpha1_*rho1_, Theta_)
           + fvm::div(phi, Theta_, "div(phi,Theta)")
          ==
             fvm::SuSp(-((PsCoeff*I) && dU), Theta_)
@@ -297,40 +297,40 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     {
         // equilibrium => dissipation == production
         // Eq. 4.14, p.82
-        volScalarField K1(2.0*(1.0 + e_)*rhoa_*gs0_);
+        volScalarField K1(2.0*(1.0 + e_)*rho1_*gs0_);
         volScalarField K3
         (
-            0.5*da_*rhoa_*
+            0.5*da_*rho1_*
             (
                 (sqrtPi/(3.0*(3.0-e_)))
-               *(1.0 + 0.4*(1.0 + e_)*(3.0*e_ - 1.0)*alpha_*gs0_)
-               +1.6*alpha_*gs0_*(1.0 + e_)/sqrtPi
+               *(1.0 + 0.4*(1.0 + e_)*(3.0*e_ - 1.0)*alpha1_*gs0_)
+               +1.6*alpha1_*gs0_*(1.0 + e_)/sqrtPi
             )
         );
 
         volScalarField K2
         (
-            4.0*da_*rhoa_*(1.0 + e_)*alpha_*gs0_/(3.0*sqrtPi) - 2.0*K3/3.0
+            4.0*da_*rho1_*(1.0 + e_)*alpha1_*gs0_/(3.0*sqrtPi) - 2.0*K3/3.0
         );
 
-        volScalarField K4(12.0*(1.0 - sqr(e_))*rhoa_*gs0_/(da_*sqrtPi));
+        volScalarField K4(12.0*(1.0 - sqr(e_))*rho1_*gs0_/(da_*sqrtPi));
 
         volScalarField trD(tr(D));
         volScalarField tr2D(sqr(trD));
         volScalarField trD2(tr(D & D));
 
-        volScalarField t1(K1*alpha_ + rhoa_);
+        volScalarField t1(K1*alpha1_ + rho1_);
         volScalarField l1(-t1*trD);
         volScalarField l2(sqr(t1)*tr2D);
         volScalarField l3
         (
             4.0
            *K4
-           *max(alpha_, scalar(1e-6))
+           *max(alpha1_, scalar(1e-6))
            *(2.0*K3*trD2 + K2*tr2D)
         );
 
-        Theta_ = sqr((l1 + sqrt(l2 + l3))/(2.0*(alpha_ + 1.0e-4)*K4));
+        Theta_ = sqr((l1 + sqrt(l2 + l3))/(2.0*(alpha1_ + 1.0e-4)*K4));
     }
 
     Theta_.max(1.0e-15);
@@ -340,9 +340,9 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         frictionalStressModel_->frictionalPressure
         (
-            alpha_,
-            alphaMinFriction_,
-            alphaMax_,
+            alpha1_,
+            alpha1MinFriction_,
+            alpha1Max_,
             Fr_,
             eta_,
             p_
@@ -362,8 +362,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         frictionalStressModel_->muf
         (
-            alpha_,
-            alphaMax_,
+            alpha1_,
+            alpha1Max_,
             pf,
             D,
             phi_
@@ -371,16 +371,16 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     );
 
     // add frictional stress
-    mua_ += muf;
-    mua_.min(1.0e+2);
-    mua_.max(0.0);
+    mu1_ += muf;
+    mu1_.min(1.0e+2);
+    mu1_.max(0.0);
 
     Info<< "kinTheory: max(Theta) = " << max(Theta_).value() << endl;
 
-    volScalarField ktn(mua_/rhoa_);
+    volScalarField ktn(mu1_/rho1_);
 
-    Info<< "kinTheory: min(nua) = " << min(ktn).value()
-        << ", max(nua) = " << max(ktn).value() << endl;
+    Info<< "kinTheory: min(nu1) = " << min(ktn).value()
+        << ", max(nu1) = " << max(ktn).value() << endl;
 
     Info<< "kinTheory: min(pa) = " << min(pa_).value()
         << ", max(pa) = " << max(pa_).value() << endl;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 59e80062ca7991b2b6c56326e013104613561325..381e32dd6625c9f0cfa78be9b5c372a0cf1c1310 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -57,15 +57,15 @@ class kineticTheoryModel
     // Private data
 
         const phaseModel& phase1_;
-        const volVectorField& Ua_;
-        const volVectorField& Ub_;
-        const volScalarField& alpha_;
-        const surfaceScalarField& phia_;
+        const volVectorField& U1_;
+        const volVectorField& U2_;
+        const volScalarField& alpha1_;
+        const surfaceScalarField& phi1_;
 
         const dragModel& draga_;
 
-        const dimensionedScalar& rhoa_;
-        const dimensionedScalar& nua_;
+        const dimensionedScalar& rho1_;
+        const dimensionedScalar& nu1_;
 
         //- dictionary holding the modeling info
         IOdictionary kineticTheoryProperties_;
@@ -92,10 +92,10 @@ class kineticTheoryModel
         const dimensionedScalar e_;
 
         //- maximum packing
-        const dimensionedScalar alphaMax_;
+        const dimensionedScalar alpha1Max_;
 
         //- min value for which the frictional stresses are zero
-        const dimensionedScalar alphaMinFriction_;
+        const dimensionedScalar alpha1MinFriction_;
 
         //- material constant for frictional normal stress
         const dimensionedScalar Fr_;
@@ -113,7 +113,7 @@ class kineticTheoryModel
         volScalarField Theta_;
 
         //- The granular viscosity
-        volScalarField mua_;
+        volScalarField mu1_;
 
         //- The granular bulk viscosity
         volScalarField lambda_;
@@ -145,8 +145,8 @@ public:
         kineticTheoryModel
         (
             const phaseModel& phase1,
-            const volVectorField& Ub,
-            const volScalarField& alpha,
+            const volVectorField& U2,
+            const volScalarField& alpha1,
             const dragModel& draga
         );
 
@@ -157,16 +157,16 @@ public:
 
     // Member Functions
 
-        void solve(const volTensorField& gradUat);
+        void solve(const volTensorField& gradU1t);
 
         bool on() const
         {
             return kineticTheory_;
         }
 
-        const volScalarField& mua() const
+        const volScalarField& mu1() const
         {
-            return mua_;
+            return mu1_;
         }
 
         const volScalarField& pa() const
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index 42c709068b6f79ee9afc78603ea76189e7a3ba1c..f16a1015b5a843a6c0b198244859c16ac79158a5 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -69,30 +69,30 @@ Foam::kineticTheoryModels::radialModels::CarnahanStarling::~CarnahanStarling()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
 
     return
-        1.0/(1.0 - alpha)
-      + 3.0*alpha/(2.0*sqr(1.0 - alpha))
-      + sqr(alpha)/(2.0*pow(1.0 - alpha, 3));
+        1.0/(1.0 - alpha1)
+      + 3.0*alpha1/(2.0*sqr(1.0 - alpha1))
+      + sqr(alpha1)/(2.0*pow(1.0 - alpha1, 3));
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        - alpha/sqr(1.0 - alpha)
-        + (3.0*(1.0 - alpha) + 6.0*sqr(alpha))/(2.0*(1.0 - alpha))
-        + (2.0*alpha*(1.0 - alpha) + 3.0*pow(alpha, 3))
-         /(2.0*pow(1.0 - alpha, 4));
+        - alpha1/sqr(1.0 - alpha1)
+        + (3.0*(1.0 - alpha1) + 6.0*sqr(alpha1))/(2.0*(1.0 - alpha1))
+        + (2.0*alpha1*(1.0 - alpha1) + 3.0*pow(alpha1, 3))
+         /(2.0*pow(1.0 - alpha1, 4));
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
index de5c24a1820785794e337500bfcecdcdd4c481b6..84ada7bb96476ddf6605d757d824029356ef8b2b 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
@@ -75,14 +75,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
index 9cd4675ce999d60cafc3a74395a27df787e65a49..b804a6a912e48f1e3f8f165ee6bb747500a00e34 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
@@ -69,24 +69,24 @@ Foam::kineticTheoryModels::radialModels::Gidaspow::~Gidaspow()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::Gidaspow::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 0.6/(1.0 - pow(alpha/alphaMax, 1.0/3.0));
+    return 0.6/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0));
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::Gidaspow::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        (-1.0/5.0)*pow(alpha/alphaMax, -2.0/3.0)
-       /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
+        (-1.0/5.0)*pow(alpha1/alpha1Max, -2.0/3.0)
+       /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)));
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
index 7f94c23a978ccbff0cbfa137aaa1d86b6b21ae7f..9df6fb08f0762db6cd17e5053d3650682dfe979d 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
@@ -74,14 +74,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index 91571b3bb3508c9a21f1b2a499f44a0020f4812b..fa2a6c359adf95d37dda912cdf557132e1f2ff20 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -69,23 +69,23 @@ Foam::kineticTheoryModels::radialModels::LunSavage::~LunSavage()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::LunSavage::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
 
-    return pow(1.0 - alpha/alphaMax, -2.5*alphaMax);
+    return pow(1.0 - alpha1/alpha1Max, -2.5*alpha1Max);
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::LunSavage::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 2.5*alphaMax*alpha*pow(1.0 - alpha, -1.0 - 2.5*alphaMax);
+    return 2.5*alpha1Max*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alpha1Max);
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
index 1e95f838aecdf21c7da2aea675cb51af500de482..8877dc5ae65b4e160bbf4587c20e1af3750a327c 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
@@ -74,14 +74,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index d9ffa4714b6aba263926b3fe317e058e95419182..60f3629c55402592588228d300d3144347f14fe7 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -69,24 +69,24 @@ Foam::kineticTheoryModels::radialModels::SinclairJackson::~SinclairJackson()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::SinclairJackson::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 1.0/(1.0 - pow(alpha/alphaMax, 1.0/3.0));
+    return 1.0/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0));
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        (-1.0/3.0)*pow(alpha/alphaMax, -2.0/3.0)
-       /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
+        (-1.0/3.0)*pow(alpha1/alpha1Max, -2.0/3.0)
+       /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)));
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
index 8df30f194513cc923060f1e5f5896b20f90fb094..68c49ea73fdb92789cc22068f306a524e4b173f3 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
@@ -74,14 +74,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
index bad05a99dff880b4adbb5b80c77af6ba03661763..aba9092a285b0d783b85e2f1fcc432804551dc1a 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -107,15 +107,15 @@ public:
         //- Radial distribution function
         virtual tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const = 0;
 
         //- Derivative of the radial distribution function
         virtual tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const = 0;
 };
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index dc513227527717b4811a6b2272d467a2d3f97542..4081dc8d2ff1c35b9742607b336a38ac21365a8a 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -62,23 +62,23 @@ Foam::kineticTheoryModels::viscosityModels::Gidaspow::~Gidaspow()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::kineticTheoryModels::viscosityModels::Gidaspow::mua
+Foam::kineticTheoryModels::viscosityModels::Gidaspow::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*sqr(alpha)
-      + (1.0/6.0)*sqrtPi*alpha
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*sqr(alpha1)
+      + (1.0/6.0)*sqrtPi*alpha1
       + (10.0/96.0)*sqrtPi/((1.0 + e)*g0)
     );
 }
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
index efe2c5727c3975b84aee768975419b3b9de2a768..bdb0640367221b089f6bc1d6956610c27a8b13df 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
@@ -71,12 +71,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index 5f65f3c74cbec3b8e25843e101c611b4d438aba0..40f84c729b9196a907b42af66c19a0d987eb29bb 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -70,12 +70,12 @@ Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::~HrenyaSinclair()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::mua
+Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
@@ -84,14 +84,14 @@ Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::mua
 
     volScalarField lamda
     (
-        scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_
+        scalar(1) + da/(6.0*sqrt(2.0)*(alpha1 + scalar(1.0e-5)))/L_
     );
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1)*sqr(alpha)/(3.0-e)
-      + (1.0/6.0)*sqrtPi*alpha*(0.5*lamda + 0.25*(3.0*e - 1.0))
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1)*sqr(alpha1)/(3.0-e)
+      + (1.0/6.0)*sqrtPi*alpha1*(0.5*lamda + 0.25*(3.0*e - 1.0))
        /(0.5*(3.0 - e)*lamda)
       + (10/96.0)*sqrtPi/((1.0 + e)*0.5*(3.0 - e)*g0*lamda)
     );
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
index 7d9640b4718ee93d3c91c8efa5a4de64ccab227b..2f5f2cd5f478235baa6d460999293aac48a17b74 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
@@ -79,12 +79,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index 7529baa3ae43c54b407105b30e0414ea331c9938..7eaa3b2901b28fa778f6e0c7dc2295e43aca1a03 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -62,23 +62,23 @@ Foam::kineticTheoryModels::viscosityModels::Syamlal::~Syamlal()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::kineticTheoryModels::viscosityModels::Syamlal::mua
+Foam::kineticTheoryModels::viscosityModels::Syamlal::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1.0)*sqr(alpha)/(3.0 - e)
-      + (1.0/6.0)*alpha*sqrtPi/(3.0 - e)
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1.0)*sqr(alpha1)/(3.0 - e)
+      + (1.0/6.0)*alpha1*sqrtPi/(3.0 - e)
     );
 }
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
index 9d784aeeb25825d3f5326b0d4c73247137cd8cb0..b9c8d6e4e3d3a91c85e022e335791ae05e479af2 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
@@ -72,12 +72,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index 36f4bab76a55c1bc8ac8fbc0f7c9b3abb920c9cd..9be0466936e91e7a317046fb563517feae479c09 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -53,12 +53,12 @@ Foam::kineticTheoryModels::noneViscosity::~noneViscosity()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mua
+Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
@@ -68,7 +68,7 @@ Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mua
         "0",
         dimensionSet(1, -1, -1, 0, 0, 0, 0),
         0.0
-    )*alpha;
+    )*alpha1;
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
index 22f60d960283c17537a6d938c3d7eef258fceb13..c4382a2c5fcd772c5d9df8c059cfc8c0093b62bd 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
@@ -70,12 +70,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index 903093822028dee13cb957d557a9eb3b8aec8fab..179da0e940eae6de2f61453ee9660621956735de 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -106,12 +106,12 @@ public:
 
     // Member Functions
 
-        virtual tmp<volScalarField> mua
+        virtual tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const = 0;
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/packingLimiter.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/packingLimiter.H
index 3790bf9bb97426661297adef4ec42a8d88be23a5..1648384bac335cca438ca48f2dc393824723f92e 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/packingLimiter.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/packingLimiter.H
@@ -1,13 +1,13 @@
     if (packingLimiter)
     {
         // Calculating exceeding volume fractions
-        volScalarField alphaEx(max(alpha1 - alphaMax, scalar(0)));
+        volScalarField alpha1Ex(max(alpha1 - alpha1Max, scalar(0)));
 
         // Finding neighbouring cells of the whole domain
         labelListList neighbour = mesh.cellCells();
         scalarField cellVolumes(mesh.cellVolumes());
 
-        forAll (alphaEx, celli)
+        forAll (alpha1Ex, celli)
         {
             // Finding the labels of the neighbouring cells
             labelList neighbourCell = neighbour[celli];
@@ -27,10 +27,10 @@
                 }
 
                 neighboursEx +=
-                    alphaEx[neighbourCell[cellj]]*cellVolumes[celli]
+                    alpha1Ex[neighbourCell[cellj]]*cellVolumes[celli]
                    /neighboursNeighbourCellVolumes;
             }
 
-            alpha1[celli] += neighboursEx - alphaEx[celli];
+            alpha1[celli] += neighboursEx - alpha1Ex[celli];
         }
     }
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H
index 3af7bd18ffa128e7a18d7f183517d342a7260340..ab45b00f2b8d848c42880f69e2a50d9b8dfc92ae 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H
@@ -25,7 +25,7 @@ Class
     Foam::diameterModel
 
 Description
-    Abstract base-class for dispersed-phase particle diameter models.
+    A2stract base-class for dispersed-phase particle diameter models.
 
 SourceFiles
     diameterModel.C
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/readPPProperties.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/readPPProperties.H
index 3acbf758d04105e7d3ec4f6aad60035c7398d082..90caafd58c10c7dd842283cac63007633a738fdf 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/readPPProperties.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/readPPProperties.H
@@ -15,9 +15,9 @@
         readScalar(ppProperties.lookup("preAlphaExp"))
     );
 
-    scalar alphaMax
+    scalar alpha1Max
     (
-        readScalar(ppProperties.lookup("alphaMax"))
+        readScalar(ppProperties.lookup("alpha1Max"))
     );
 
     scalar expMax
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/turbulenceModel/kEpsilon.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/turbulenceModel/kEpsilon.H
index 1ed20444bc93f24d9786d26de4fb3b90850e37ef..ed9d393af27ff13e563c753e564098a07a944844 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/turbulenceModel/kEpsilon.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/turbulenceModel/kEpsilon.H
@@ -15,10 +15,10 @@ if (turbulence)
     fvScalarMatrix epsEqn
     (
         fvm::ddt(alpha2, epsilon)
-      + fvm::div(alphaPhi2, epsilon)
+      + fvm::div(alpha1Phi2, epsilon)
       - fvm::laplacian
         (
-            alphaEps*nuEff2, epsilon,
+            alpha1Eps*nuEff2, epsilon,
             "laplacian(DepsilonEff,epsilon)"
         )
       ==
@@ -40,10 +40,10 @@ if (turbulence)
     fvScalarMatrix kEqn
     (
         fvm::ddt(alpha2, k)
-      + fvm::div(alphaPhi2, k)
+      + fvm::div(alpha1Phi2, k)
       - fvm::laplacian
         (
-            alphak*nuEff2, k,
+            alpha1k*nuEff2, k,
             "laplacian(DkEff,k)"
         )
       ==
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
index 589f4a4e81fc8d0439dfa09b6be7c6b4250b5734..bca13fc5e5831dc8443483dbec2ee6d73fc32997 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
@@ -70,12 +70,12 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(phase2_, scalar(1.0e-6)));
+    volScalarField alpha2(max(phase2_, scalar(1.0e-6)));
 
     return
         150.0*phase1_*phase2_.nu()*phase2_.rho()
-       /sqr(beta*phase1_.d())
-      + 1.75*phase2_.rho()*Ur/(beta*phase1_.d());
+       /sqr(alpha2*phase1_.d())
+      + 1.75*phase2_.rho()*Ur/(alpha2*phase1_.d());
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index 767d2e34fe6e3851d1272f81699b36e0226a74c9..2f41d440ec3939c9f4bfdc841e2323510e4e40f8 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -70,9 +70,9 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::Gibilaro::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(phase2_, scalar(1.0e-6)));
-    volScalarField bp(pow(beta, -2.8));
-    volScalarField Re(max(beta*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
+    volScalarField alpha2(max(phase2_, scalar(1.0e-6)));
+    volScalarField bp(pow(alpha2, -2.8));
+    volScalarField Re(max(alpha2*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
 
     return (17.3/Re + scalar(0.336))*phase2_.rho()*Ur*bp/phase1_.d();
 }
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index b52b766de9238653fdc699a75c6baa14e914cbc6..fa9e274dc9fd2de25071a811da864cca72c349ae 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -70,9 +70,9 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::GidaspowErgunWenYu::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(phase2_, scalar(1.0e-6)));
+    volScalarField alpha2(max(phase2_, scalar(1.0e-6)));
     volScalarField d = phase1_.d();
-    volScalarField bp(pow(beta, -2.65));
+    volScalarField bp(pow(alpha2, -2.65));
     volScalarField Re(max(Ur*d/phase2_.nu(), scalar(1.0e-3)));
 
     volScalarField Cds
@@ -84,12 +84,12 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::GidaspowErgunWenYu::K
     // Wen and Yu (1966)
     return
     (
-        pos(beta - 0.8)
+        pos(alpha2 - 0.8)
        *(0.75*Cds*phase2_.rho()*Ur*bp/d)
-      + neg(beta - 0.8)
+      + neg(alpha2 - 0.8)
        *(
-           150.0*phase1_*phase2_.nu()*phase2_.rho()/(sqr(beta*d))
-         + 1.75*phase2_.rho()*Ur/(beta*d)
+           150.0*phase1_*phase2_.nu()*phase2_.rho()/(sqr(alpha2*d))
+         + 1.75*phase2_.rho()*Ur/(alpha2*d)
         )
     );
 }
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index 25de6b1dc7001cd66e7094996655a3913dca7bed..10bf0697555fddd11d85c83fe2f582b3d8db3c81 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -70,10 +70,10 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::GidaspowSchillerNaumann::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(phase2_, scalar(1e-6)));
-    volScalarField bp(pow(beta, -2.65));
+    volScalarField alpha2(max(phase2_, scalar(1e-6)));
+    volScalarField bp(pow(alpha2, -2.65));
 
-    volScalarField Re(max(beta*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
+    volScalarField Re(max(alpha2*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
     volScalarField Cds
     (
         neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index 07f85b38a1f8e04809689ea6e1d94e13255552a8..aef357eee7d9eae8e35e60be375becb40293e82f 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -70,12 +70,12 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::SyamlalOBrien::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(phase2_, scalar(1.0e-6)));
-    volScalarField A(pow(beta, 4.14));
+    volScalarField alpha2(max(phase2_, scalar(1.0e-6)));
+    volScalarField A(pow(alpha2, 4.14));
     volScalarField B
     (
-        neg(beta - 0.85)*(0.8*pow(beta, 1.28))
-      + pos(beta - 0.85)*(pow(beta, 2.65))
+        neg(alpha2 - 0.85)*(0.8*pow(alpha2, 1.28))
+      + pos(alpha2 - 0.85)*(pow(alpha2, 2.65))
     );
 
     volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
index 6319276408b935a09c5102ed726af4fb54004c9c..7958ce072624aac66c608cf878712cd5ad4e39de 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
@@ -70,8 +70,8 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::WenYu::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(phase2_, scalar(1.0e-6)));
-    volScalarField bp(pow(beta, -2.65));
+    volScalarField alpha2(max(phase2_, scalar(1.0e-6)));
+    volScalarField bp(pow(alpha2, -2.65));
 
     volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
     volScalarField Cds
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index 3a9536c88104a010357996accb665433b568f219..80292be659d86c66e6556ac286d125164d8b16e6 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -129,12 +129,13 @@ public:
         }
 
         //- the dragfunction K used in the momentum eq.
-        //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
-        //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
+        //    ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(U1-U2)
+        //    ddt(alpha2*rho2*U2) + ...  = ... alpha1*alpha2*K*(U2-U1)
         // ********************************** NB! *****************************
-        // for numerical reasons alpha and beta has been
+        // for numerical reasons alpha1 and alpha2 has been
         // extracted from the dragFunction K,
-        // so you MUST divide K by alpha*beta when implemnting the drag function
+        // so you MUST divide K by alpha1*alpha2 when implemnting the drag
+        // function
         // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index cc53c67d763ec109f9d7dc31ad83c37046d84635..2d2e4f5646ff3507e55fdac0340ac1a76500b696 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -49,12 +49,12 @@ namespace heatTransferModels
 Foam::heatTransferModels::RanzMarshall::RanzMarshall
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    heatTransferModel(interfaceDict, alpha, phase1, phase2)
+    heatTransferModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
index 0013e3f1d17703e778586fef8b110a4d45df754c..cfcb0ba560aeaf1e6e31adf93e8d8adeb62e5ca8 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
@@ -64,7 +64,7 @@ public:
         RanzMarshall
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index 810adfe4159055804ecebbbd9df0d2725447eb6b..586e93132280c0a41a187cc852f81ddc067ffe0f 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
@@ -39,13 +39,13 @@ namespace Foam
 Foam::heatTransferModel::heatTransferModel
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
     interfaceDict_(interfaceDict),
-    alpha_(alpha),
+    alpha1_(alpha1),
     phase1_(phase1),
     phase2_(phase2)
 {}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index 5541795bfd38b112a540cd7f769a4d4b5239b3e4..afda05400849b1337b6c124d72916342e3011069 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -55,7 +55,7 @@ protected:
     // Protected data
 
         const dictionary& interfaceDict_;
-        const volScalarField& alpha_;
+        const volScalarField& alpha1_;
         const phaseModel& phase1_;
         const phaseModel& phase2_;
 
@@ -75,11 +75,11 @@ public:
             dictionary,
             (
                 const dictionary& interfaceDict,
-                const volScalarField& alpha,
+                const volScalarField& alpha1,
                 const phaseModel& phase1,
                 const phaseModel& phase2
             ),
-            (interfaceDict, alpha, phase1, phase2)
+            (interfaceDict, alpha1, phase1, phase2)
         );
 
 
@@ -88,7 +88,7 @@ public:
         heatTransferModel
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
@@ -103,7 +103,7 @@ public:
         static autoPtr<heatTransferModel> New
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
@@ -112,12 +112,12 @@ public:
     // Member Functions
 
         //- the heat-transfer function K used in the enthalpy eq.
-        //    ddt(alpha*rhoa*ha) + ... = ... alpha*beta*K*(Ta - Tb)
-        //    ddt(beta*rhob*hb) + ...  = ... alpha*beta*K*(Tb - Ta)
+        //    ddt(alpha1*rho1*ha) + ... = ... alpha1*alpha2*K*(Ta - Tb)
+        //    ddt(alpha2*rho2*hb) + ...  = ... alpha1*alpha2*K*(Tb - Ta)
         // ********************************** NB! *****************************
-        // for numerical reasons alpha and beta has been
+        // for numerical reasons alpha1 and alpha2 has been
         // extracted from the heat-transfer function K,
-        // so you MUST divide K by alpha*beta when implementing the
+        // so you MUST divide K by alpha1*alpha2 when implementing the
         // heat-transfer function
         // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index b14f3821bfef062f2616f5d4ced8325053667560..2e9a2b10ed95f93811d1481c0e160c207ec15e5b 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -30,7 +30,7 @@ License
 Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
@@ -58,7 +58,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
             << exit(FatalError);
     }
 
-    return cstrIter()(interfaceDict, alpha, phase1, phase2);
+    return cstrIter()(interfaceDict, alpha1, phase1, phase2);
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
index 0a2ac036b3a05b778ca0fc763ca5ed5981aaf26a..b1169797dc861b1a301a2a91cf9c1381d08807bd 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
@@ -70,21 +70,21 @@ Foam::kineticTheoryModels::conductivityModels::Gidaspow::~Gidaspow()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::conductivityModels::Gidaspow::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*g0*0.5*(1.0 + e)*sqr(alpha)
-      + (15.0/16.0)*sqrtPi*alpha
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*g0*0.5*(1.0 + e)*sqr(alpha1)
+      + (15.0/16.0)*sqrtPi*alpha1
       + (25.0/64.0)*sqrtPi/((1.0 + e)*g0)
     );
 }
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
index b6c55696ce5a84954a2fb661be0ce8f561cd81ff..3f36f18bb307c1082252426a245992614dbba0bd 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
@@ -74,10 +74,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index cc9ac56cfdf9626ee48617df84484de9320dadf9..3d89e77293d6ccec250dfb14b2d9009a6b3bf99c 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -73,10 +73,10 @@ Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
@@ -85,15 +85,15 @@ Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::kappa
 
     volScalarField lamda
     (
-        scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_
+        scalar(1) + da/(6.0*sqrt(2.0)*(alpha1 + scalar(1.0e-5)))/L_
     );
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha)
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha1)
        /(49.0/16.0 - 33.0*e/16.0)
-      + (15.0/16.0)*sqrtPi*alpha*(0.5*sqr(e) + 0.25*e - 0.75 + lamda)
+      + (15.0/16.0)*sqrtPi*alpha1*(0.5*sqr(e) + 0.25*e - 0.75 + lamda)
        /((49.0/16.0 - 33.0*e/16.0)*lamda)
       + (25.0/64.0)*sqrtPi
        /((1.0 + e)*(49.0/16.0 - 33.0*e/16.0)*lamda*g0)
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
index 3a635724b3de259d047daf3bb288a15331c5ce7b..2ef3d8c42c2e821c2694e971798d308ed9f0113d 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
@@ -79,10 +79,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
index 4d99b686a4909e47fed2459ed497247aff78cb70..ef04fe87dd0b87042de13c7f852aeeeb5409068f 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
@@ -70,22 +70,22 @@ Foam::kineticTheoryModels::conductivityModels::Syamlal::~Syamlal()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::conductivityModels::Syamlal::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*g0*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha)
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*g0*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha1)
        /(49.0/16.0 - 33.0*e/16.0)
-      + (15.0/32.0)*sqrtPi*alpha/(49.0/16.0 - 33.0*e/16.0)
+      + (15.0/32.0)*sqrtPi*alpha1/(49.0/16.0 - 33.0*e/16.0)
     );
 }
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
index e25c8f51e6cd8ac35ef4e5cc88616610e817e363..032ce1406777fa2c1b6e8149aadb4e6af88f8459 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
@@ -74,10 +74,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 4f872bbd3ccde35520c730045ba536c5564af550..4fc3a59ac88a9e25a361421b418de1c3a7097ca0 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -106,10 +106,10 @@ public:
 
         virtual tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const = 0;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 15c820874a5e59dc6d2dfda622e91f819ad1ce7d..bef0d689b3819c9355e13442b850bf9a34465d44 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -72,9 +72,9 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::
 frictionalPressure
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -82,8 +82,8 @@ frictionalPressure
 {
 
     return
-        Fr*pow(max(alpha - alphaMinFriction, scalar(0)), eta)
-       /pow(max(alphaMax - alpha, scalar(5.0e-2)), p);
+        Fr*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta)
+       /pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p);
 }
 
 
@@ -91,9 +91,9 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::
 frictionalPressurePrime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -101,17 +101,18 @@ frictionalPressurePrime
 {
     return Fr*
     (
-        eta*pow(max(alpha - alphaMinFriction, scalar(0)), eta - 1.0)
-       *(alphaMax-alpha) + p*pow(max(alpha - alphaMinFriction, scalar(0)), eta)
-    )/pow(max(alphaMax - alpha, scalar(5.0e-2)), p + 1.0);
+        eta*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta - 1.0)
+       *(alpha1Max-alpha1)
+      + p*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta)
+    )/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p + 1.0);
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::muf
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max,
     const volScalarField& pf,
     const volSymmTensorField& D,
     const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
index ace67f54d185449178d63700c14059405e10db7a..85a0c1431a308ef4dcaf401bc419ce2543a500bd 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
@@ -74,9 +74,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -84,9 +84,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -94,8 +94,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index d458f07b754218cb44de74b2cbe483b68626f188..6c855527fb93c3cefcad260a12d0e7a10a71054e 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -70,9 +70,9 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::
 frictionalPressure
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -80,7 +80,7 @@ frictionalPressure
 {
     return
         dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24)
-       *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 10.0);
+       *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 10.0);
 }
 
 
@@ -88,9 +88,9 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::
 frictionalPressurePrime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -98,15 +98,15 @@ frictionalPressurePrime
 {
     return
         dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25)
-       *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 9.0);
+       *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 9.0);
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max,
     const volScalarField& pf,
     const volSymmTensorField& D,
     const dimensionedScalar& phi
@@ -123,10 +123,10 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
             IOobject
             (
                 "muf",
-                alpha.mesh().time().timeName(),
-                alpha.mesh()
+                alpha1.mesh().time().timeName(),
+                alpha1.mesh()
             ),
-            alpha.mesh(),
+            alpha1.mesh(),
             dimensionedScalar("muf", dimensionSet(1, -1, -1, 0, 0), 0.0)
         )
     );
@@ -135,7 +135,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf
 
     forAll (D, celli)
     {
-        if (alpha[celli] > alphaMax.value() - 5e-2)
+        if (alpha1[celli] > alpha1Max.value() - 5e-2)
         {
             muff[celli] =
                 0.5*pf[celli]*sin(phi.value())
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
index ec517774a1ef80c867fadbd05425f6cd695d41d3..00d2fe2227b20d69f6e5b03b72204ffeb067459a 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
@@ -74,9 +74,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -84,9 +84,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& n,
             const dimensionedScalar& p
@@ -94,8 +94,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index aa5983d5d23a32853349887e2e96f5fc958de90d..a7843785de948945342083788aae2294b201f6c1 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -106,9 +106,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -116,9 +116,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alphaf,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1f,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -126,8 +126,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
index 2655267134f22b080cbcfd5f93ec1cd6c85b7fda..3bf8a466334af443d0adfdb799d849403773d768 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
@@ -69,14 +69,14 @@ Foam::kineticTheoryModels::granularPressureModels::Lun::~Lun()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::granularPressureModels::Lun::granularPressureCoeff
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
 
-    return rhoa*alpha*(1.0 + 2.0*(1.0 + e)*alpha*g0);
+    return rho1*alpha1*(1.0 + 2.0*(1.0 + e)*alpha1*g0);
 }
 
 
@@ -84,14 +84,14 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::granularPressureModels::Lun::
 granularPressureCoeffPrime
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
     const volScalarField& g0prime,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
-    return rhoa*(1.0 + alpha*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha));
+    return rho1*(1.0 + alpha1*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha1));
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
index 81a58d409a902eea6a78e5255e286183d5b1b98d..056a42d40b3ac8fc0fc883c9d99de538df55c197 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
@@ -74,18 +74,18 @@ public:
 
         tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 
         tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 };
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
index 34ba15cbcf4aff0cf53be15ac19c0b572721dcb0..4c7e58bb6626968c0d80121e6bfc66bf4e92f1ae 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
@@ -72,14 +72,14 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::granularPressureModels::SyamlalRogersOBrien::
 granularPressureCoeff
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
 
-    return 2.0*rhoa*(1.0 + e)*sqr(alpha)*g0;
+    return 2.0*rho1*(1.0 + e)*sqr(alpha1)*g0;
 }
 
 
@@ -87,14 +87,14 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::granularPressureModels::SyamlalRogersOBrien::
 granularPressureCoeffPrime
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
     const volScalarField& g0prime,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
-    return rhoa*alpha*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha);
+    return rho1*alpha1*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha1);
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
index c328481a1c526a78ee8daac9dcf84d4e2899a34b..b41f52e6b02d3413ea249a89b9ac74933f44a333 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
@@ -74,18 +74,18 @@ public:
 
         tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 
         tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 };
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 1ae4da2e8e4e95b927fe2dced000a7820e71716f..099dbceaf56484a3164161ab06f2a05a89dfe65d 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -107,19 +107,19 @@ public:
         //- Granular pressure coefficient
         virtual tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const = 0;
 
         //- Derivative of the granular pressure coefficient
         virtual tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const = 0;
 };
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index d4513e922f9af75c2c9d6570f0f24d39c7e2cb7f..7144ca86c76de43b11acb285df1f3db45a19c4ab 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -33,28 +33,28 @@ License
 Foam::kineticTheoryModel::kineticTheoryModel
 (
     const Foam::phaseModel& phase1,
-    const Foam::volVectorField& Ub,
-    const Foam::volScalarField& alpha,
-    const Foam::dragModel& draga
+    const Foam::volVectorField& U2,
+    const Foam::volScalarField& alpha1,
+    const Foam::dragModel& drag1
 )
 :
     phase1_(phase1),
-    Ua_(phase1.U()),
-    Ub_(Ub),
-    alpha_(alpha),
-    phia_(phase1.phi()),
-    draga_(draga),
+    U1_(phase1.U()),
+    U2_(U2),
+    alpha1_(alpha1),
+    phi1_(phase1.phi()),
+    drag1_(drag1),
 
-    rhoa_(phase1.rho()),
-    nua_(phase1.nu()),
+    rho1_(phase1.rho()),
+    nu1_(phase1.nu()),
 
     kineticTheoryProperties_
     (
         IOobject
         (
             "kineticTheoryProperties",
-            Ua_.time().constant(),
-            Ua_.mesh(),
+            U1_.time().constant(),
+            U1_.mesh(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )
@@ -98,8 +98,8 @@ Foam::kineticTheoryModel::kineticTheoryModel
         )
     ),
     e_(kineticTheoryProperties_.lookup("e")),
-    alphaMax_(kineticTheoryProperties_.lookup("alphaMax")),
-    alphaMinFriction_(kineticTheoryProperties_.lookup("alphaMinFriction")),
+    alpha1Max_(kineticTheoryProperties_.lookup("alpha1Max")),
+    alpha1MinFriction_(kineticTheoryProperties_.lookup("alpha1MinFriction")),
     Fr_(kineticTheoryProperties_.lookup("Fr")),
     eta_(kineticTheoryProperties_.lookup("eta")),
     p_(kineticTheoryProperties_.lookup("p")),
@@ -109,24 +109,24 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "Theta",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh()
+        U1_.mesh()
     ),
-    mua_
+    mu1_
     (
         IOobject
         (
-            "mua",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            "mu1",
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     lambda_
@@ -134,12 +134,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "lambda",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     pa_
@@ -147,12 +147,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "pa",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -2, 0, 0), 0.0)
     ),
     kappa_
@@ -160,12 +160,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "kappa",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     gs0_
@@ -173,12 +173,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "gs0",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 1.0)
     )
 {}
@@ -192,7 +192,7 @@ Foam::kineticTheoryModel::~kineticTheoryModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
+void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
 {
     if (!kineticTheory_)
     {
@@ -203,24 +203,24 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
 
     volScalarField da_(phase1_.d());
 
-    surfaceScalarField phi(1.5*rhoa_*phia_*fvc::interpolate(alpha_));
+    surfaceScalarField phi(1.5*rho1_*phi1_*fvc::interpolate(alpha1_));
 
-    volTensorField dU(gradUat.T());    //fvc::grad(Ua_);
+    volTensorField dU(gradU1t.T());    //fvc::grad(U1_);
     volSymmTensorField D(symm(dU));
 
-    // NB, drag = K*alpha*beta,
-    // (the alpha and beta has been extracted from the drag function for
+    // NB, drag = K*alpha1*alpha2,
+    // (the alpha1 and alpha2 has been extracted from the drag function for
     // numerical reasons)
-    volScalarField Ur(mag(Ua_ - Ub_));
-    volScalarField betaPrim(alpha_*(1.0 - alpha_)*draga_.K(Ur));
+    volScalarField Ur(mag(U1_ - U2_));
+    volScalarField alpha2Prim(alpha1_*(1.0 - alpha1_)*drag1_.K(Ur));
 
     // Calculating the radial distribution function (solid volume fraction is
     //  limited close to the packing limit, but this needs improvements)
     //  The solution is higly unstable close to the packing limit.
     gs0_ = radialModel_->g0
     (
-        min(max(alpha_, scalar(1e-6)), alphaMax_ - 0.01),
-        alphaMax_
+        min(max(alpha1_, scalar(1e-6)), alpha1Max_ - 0.01),
+        alpha1Max_
     );
 
     // particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45)
@@ -228,18 +228,18 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         granularPressureModel_->granularPressureCoeff
         (
-            alpha_,
+            alpha1_,
             gs0_,
-            rhoa_,
+            rho1_,
             e_
         )
     );
 
     // 'thermal' conductivity (Table 3.3, p. 49)
-    kappa_ = conductivityModel_->kappa(alpha_, Theta_, gs0_, rhoa_, da_, e_);
+    kappa_ = conductivityModel_->kappa(alpha1_, Theta_, gs0_, rho1_, da_, e_);
 
     // particle viscosity (Table 3.2, p.47)
-    mua_ = viscosityModel_->mua(alpha_, Theta_, gs0_, rhoa_, da_, e_);
+    mu1_ = viscosityModel_->mu1(alpha1_, Theta_, gs0_, rho1_, da_, e_);
 
     dimensionedScalar Tsmall
     (
@@ -254,22 +254,22 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     // dissipation (Eq. 3.24, p.50)
     volScalarField gammaCoeff
     (
-        12.0*(1.0 - sqr(e_))*sqr(alpha_)*rhoa_*gs0_*(1.0/da_)*ThetaSqrt/sqrtPi
+        12.0*(1.0 - sqr(e_))*sqr(alpha1_)*rho1_*gs0_*(1.0/da_)*ThetaSqrt/sqrtPi
     );
 
     // Eq. 3.25, p. 50 Js = J1 - J2
-    volScalarField J1(3.0*betaPrim);
+    volScalarField J1(3.0*alpha2Prim);
     volScalarField J2
     (
-        0.25*sqr(betaPrim)*da_*sqr(Ur)
-       /(max(alpha_, scalar(1e-6))*rhoa_*sqrtPi*(ThetaSqrt + TsmallSqrt))
+        0.25*sqr(alpha2Prim)*da_*sqr(Ur)
+       /(max(alpha1_, scalar(1e-6))*rho1_*sqrtPi*(ThetaSqrt + TsmallSqrt))
     );
 
     // bulk viscosity  p. 45 (Lun et al. 1984).
-    lambda_ = (4.0/3.0)*sqr(alpha_)*rhoa_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
+    lambda_ = (4.0/3.0)*sqr(alpha1_)*rho1_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
 
     // stress tensor, Definitions, Table 3.1, p. 43
-    volSymmTensorField tau(2.0*mua_*D + (lambda_ - (2.0/3.0)*mua_)*tr(D)*I);
+    volSymmTensorField tau(2.0*mu1_*D + (lambda_ - (2.0/3.0)*mu1_)*tr(D)*I);
 
     if (!equilibrium_)
     {
@@ -279,7 +279,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
         // wrong sign infront of laplacian
         fvScalarMatrix ThetaEqn
         (
-            fvm::ddt(1.5*alpha_*rhoa_, Theta_)
+            fvm::ddt(1.5*alpha1_*rho1_, Theta_)
           + fvm::div(phi, Theta_, "div(phi,Theta)")
          ==
             fvm::SuSp(-((PsCoeff*I) && dU), Theta_)
@@ -297,40 +297,40 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     {
         // equilibrium => dissipation == production
         // Eq. 4.14, p.82
-        volScalarField K1(2.0*(1.0 + e_)*rhoa_*gs0_);
+        volScalarField K1(2.0*(1.0 + e_)*rho1_*gs0_);
         volScalarField K3
         (
-            0.5*da_*rhoa_*
+            0.5*da_*rho1_*
             (
                 (sqrtPi/(3.0*(3.0-e_)))
-               *(1.0 + 0.4*(1.0 + e_)*(3.0*e_ - 1.0)*alpha_*gs0_)
-               +1.6*alpha_*gs0_*(1.0 + e_)/sqrtPi
+               *(1.0 + 0.4*(1.0 + e_)*(3.0*e_ - 1.0)*alpha1_*gs0_)
+               +1.6*alpha1_*gs0_*(1.0 + e_)/sqrtPi
             )
         );
 
         volScalarField K2
         (
-            4.0*da_*rhoa_*(1.0 + e_)*alpha_*gs0_/(3.0*sqrtPi) - 2.0*K3/3.0
+            4.0*da_*rho1_*(1.0 + e_)*alpha1_*gs0_/(3.0*sqrtPi) - 2.0*K3/3.0
         );
 
-        volScalarField K4(12.0*(1.0 - sqr(e_))*rhoa_*gs0_/(da_*sqrtPi));
+        volScalarField K4(12.0*(1.0 - sqr(e_))*rho1_*gs0_/(da_*sqrtPi));
 
         volScalarField trD(tr(D));
         volScalarField tr2D(sqr(trD));
         volScalarField trD2(tr(D & D));
 
-        volScalarField t1(K1*alpha_ + rhoa_);
+        volScalarField t1(K1*alpha1_ + rho1_);
         volScalarField l1(-t1*trD);
         volScalarField l2(sqr(t1)*tr2D);
         volScalarField l3
         (
             4.0
            *K4
-           *max(alpha_, scalar(1e-6))
+           *max(alpha1_, scalar(1e-6))
            *(2.0*K3*trD2 + K2*tr2D)
         );
 
-        Theta_ = sqr((l1 + sqrt(l2 + l3))/(2.0*(alpha_ + 1.0e-4)*K4));
+        Theta_ = sqr((l1 + sqrt(l2 + l3))/(2.0*(alpha1_ + 1.0e-4)*K4));
     }
 
     Theta_.max(1.0e-15);
@@ -340,9 +340,9 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         frictionalStressModel_->frictionalPressure
         (
-            alpha_,
-            alphaMinFriction_,
-            alphaMax_,
+            alpha1_,
+            alpha1MinFriction_,
+            alpha1Max_,
             Fr_,
             eta_,
             p_
@@ -362,8 +362,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         frictionalStressModel_->muf
         (
-            alpha_,
-            alphaMax_,
+            alpha1_,
+            alpha1Max_,
             pf,
             D,
             phi_
@@ -371,16 +371,16 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     );
 
     // add frictional stress
-    mua_ += muf;
-    mua_.min(1.0e+2);
-    mua_.max(0.0);
+    mu1_ += muf;
+    mu1_.min(1.0e+2);
+    mu1_.max(0.0);
 
     Info<< "kinTheory: max(Theta) = " << max(Theta_).value() << endl;
 
-    volScalarField ktn(mua_/rhoa_);
+    volScalarField ktn(mu1_/rho1_);
 
-    Info<< "kinTheory: min(nua) = " << min(ktn).value()
-        << ", max(nua) = " << max(ktn).value() << endl;
+    Info<< "kinTheory: min(nu1) = " << min(ktn).value()
+        << ", max(nu1) = " << max(ktn).value() << endl;
 
     Info<< "kinTheory: min(pa) = " << min(pa_).value()
         << ", max(pa) = " << max(pa_).value() << endl;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 59e80062ca7991b2b6c56326e013104613561325..0db435f58033f480dad15405425f201f0fc44a23 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -57,15 +57,15 @@ class kineticTheoryModel
     // Private data
 
         const phaseModel& phase1_;
-        const volVectorField& Ua_;
-        const volVectorField& Ub_;
-        const volScalarField& alpha_;
-        const surfaceScalarField& phia_;
+        const volVectorField& U1_;
+        const volVectorField& U2_;
+        const volScalarField& alpha1_;
+        const surfaceScalarField& phi1_;
 
-        const dragModel& draga_;
+        const dragModel& drag1_;
 
-        const dimensionedScalar& rhoa_;
-        const dimensionedScalar& nua_;
+        const dimensionedScalar& rho1_;
+        const dimensionedScalar& nu1_;
 
         //- dictionary holding the modeling info
         IOdictionary kineticTheoryProperties_;
@@ -92,10 +92,10 @@ class kineticTheoryModel
         const dimensionedScalar e_;
 
         //- maximum packing
-        const dimensionedScalar alphaMax_;
+        const dimensionedScalar alpha1Max_;
 
         //- min value for which the frictional stresses are zero
-        const dimensionedScalar alphaMinFriction_;
+        const dimensionedScalar alpha1MinFriction_;
 
         //- material constant for frictional normal stress
         const dimensionedScalar Fr_;
@@ -113,7 +113,7 @@ class kineticTheoryModel
         volScalarField Theta_;
 
         //- The granular viscosity
-        volScalarField mua_;
+        volScalarField mu1_;
 
         //- The granular bulk viscosity
         volScalarField lambda_;
@@ -145,9 +145,9 @@ public:
         kineticTheoryModel
         (
             const phaseModel& phase1,
-            const volVectorField& Ub,
-            const volScalarField& alpha,
-            const dragModel& draga
+            const volVectorField& U2,
+            const volScalarField& alpha1,
+            const dragModel& drag1
         );
 
 
@@ -157,16 +157,16 @@ public:
 
     // Member Functions
 
-        void solve(const volTensorField& gradUat);
+        void solve(const volTensorField& gradU1t);
 
         bool on() const
         {
             return kineticTheory_;
         }
 
-        const volScalarField& mua() const
+        const volScalarField& mu1() const
         {
-            return mua_;
+            return mu1_;
         }
 
         const volScalarField& pa() const
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index 42c709068b6f79ee9afc78603ea76189e7a3ba1c..f16a1015b5a843a6c0b198244859c16ac79158a5 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -69,30 +69,30 @@ Foam::kineticTheoryModels::radialModels::CarnahanStarling::~CarnahanStarling()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
 
     return
-        1.0/(1.0 - alpha)
-      + 3.0*alpha/(2.0*sqr(1.0 - alpha))
-      + sqr(alpha)/(2.0*pow(1.0 - alpha, 3));
+        1.0/(1.0 - alpha1)
+      + 3.0*alpha1/(2.0*sqr(1.0 - alpha1))
+      + sqr(alpha1)/(2.0*pow(1.0 - alpha1, 3));
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        - alpha/sqr(1.0 - alpha)
-        + (3.0*(1.0 - alpha) + 6.0*sqr(alpha))/(2.0*(1.0 - alpha))
-        + (2.0*alpha*(1.0 - alpha) + 3.0*pow(alpha, 3))
-         /(2.0*pow(1.0 - alpha, 4));
+        - alpha1/sqr(1.0 - alpha1)
+        + (3.0*(1.0 - alpha1) + 6.0*sqr(alpha1))/(2.0*(1.0 - alpha1))
+        + (2.0*alpha1*(1.0 - alpha1) + 3.0*pow(alpha1, 3))
+         /(2.0*pow(1.0 - alpha1, 4));
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
index de5c24a1820785794e337500bfcecdcdd4c481b6..84ada7bb96476ddf6605d757d824029356ef8b2b 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
@@ -75,14 +75,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
index 9cd4675ce999d60cafc3a74395a27df787e65a49..b804a6a912e48f1e3f8f165ee6bb747500a00e34 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
@@ -69,24 +69,24 @@ Foam::kineticTheoryModels::radialModels::Gidaspow::~Gidaspow()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::Gidaspow::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 0.6/(1.0 - pow(alpha/alphaMax, 1.0/3.0));
+    return 0.6/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0));
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::Gidaspow::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        (-1.0/5.0)*pow(alpha/alphaMax, -2.0/3.0)
-       /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
+        (-1.0/5.0)*pow(alpha1/alpha1Max, -2.0/3.0)
+       /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)));
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
index 7f94c23a978ccbff0cbfa137aaa1d86b6b21ae7f..9df6fb08f0762db6cd17e5053d3650682dfe979d 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
@@ -74,14 +74,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index 91571b3bb3508c9a21f1b2a499f44a0020f4812b..fa2a6c359adf95d37dda912cdf557132e1f2ff20 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -69,23 +69,23 @@ Foam::kineticTheoryModels::radialModels::LunSavage::~LunSavage()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::LunSavage::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
 
-    return pow(1.0 - alpha/alphaMax, -2.5*alphaMax);
+    return pow(1.0 - alpha1/alpha1Max, -2.5*alpha1Max);
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::LunSavage::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 2.5*alphaMax*alpha*pow(1.0 - alpha, -1.0 - 2.5*alphaMax);
+    return 2.5*alpha1Max*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alpha1Max);
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
index 1e95f838aecdf21c7da2aea675cb51af500de482..8877dc5ae65b4e160bbf4587c20e1af3750a327c 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
@@ -74,14 +74,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index d9ffa4714b6aba263926b3fe317e058e95419182..60f3629c55402592588228d300d3144347f14fe7 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -69,24 +69,24 @@ Foam::kineticTheoryModels::radialModels::SinclairJackson::~SinclairJackson()
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::SinclairJackson::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 1.0/(1.0 - pow(alpha/alphaMax, 1.0/3.0));
+    return 1.0/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0));
 }
 
 
 Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        (-1.0/3.0)*pow(alpha/alphaMax, -2.0/3.0)
-       /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
+        (-1.0/3.0)*pow(alpha1/alpha1Max, -2.0/3.0)
+       /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)));
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
index 8df30f194513cc923060f1e5f5896b20f90fb094..68c49ea73fdb92789cc22068f306a524e4b173f3 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
@@ -74,14 +74,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
index bad05a99dff880b4adbb5b80c77af6ba03661763..aba9092a285b0d783b85e2f1fcc432804551dc1a 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -107,15 +107,15 @@ public:
         //- Radial distribution function
         virtual tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const = 0;
 
         //- Derivative of the radial distribution function
         virtual tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const = 0;
 };
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index dc513227527717b4811a6b2272d467a2d3f97542..4081dc8d2ff1c35b9742607b336a38ac21365a8a 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -62,23 +62,23 @@ Foam::kineticTheoryModels::viscosityModels::Gidaspow::~Gidaspow()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::kineticTheoryModels::viscosityModels::Gidaspow::mua
+Foam::kineticTheoryModels::viscosityModels::Gidaspow::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*sqr(alpha)
-      + (1.0/6.0)*sqrtPi*alpha
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*sqr(alpha1)
+      + (1.0/6.0)*sqrtPi*alpha1
       + (10.0/96.0)*sqrtPi/((1.0 + e)*g0)
     );
 }
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
index efe2c5727c3975b84aee768975419b3b9de2a768..bdb0640367221b089f6bc1d6956610c27a8b13df 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
@@ -71,12 +71,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index 5f65f3c74cbec3b8e25843e101c611b4d438aba0..40f84c729b9196a907b42af66c19a0d987eb29bb 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -70,12 +70,12 @@ Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::~HrenyaSinclair()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::mua
+Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
@@ -84,14 +84,14 @@ Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::mua
 
     volScalarField lamda
     (
-        scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_
+        scalar(1) + da/(6.0*sqrt(2.0)*(alpha1 + scalar(1.0e-5)))/L_
     );
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1)*sqr(alpha)/(3.0-e)
-      + (1.0/6.0)*sqrtPi*alpha*(0.5*lamda + 0.25*(3.0*e - 1.0))
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1)*sqr(alpha1)/(3.0-e)
+      + (1.0/6.0)*sqrtPi*alpha1*(0.5*lamda + 0.25*(3.0*e - 1.0))
        /(0.5*(3.0 - e)*lamda)
       + (10/96.0)*sqrtPi/((1.0 + e)*0.5*(3.0 - e)*g0*lamda)
     );
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
index 7d9640b4718ee93d3c91c8efa5a4de64ccab227b..2f5f2cd5f478235baa6d460999293aac48a17b74 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
@@ -79,12 +79,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index 7529baa3ae43c54b407105b30e0414ea331c9938..7eaa3b2901b28fa778f6e0c7dc2295e43aca1a03 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -62,23 +62,23 @@ Foam::kineticTheoryModels::viscosityModels::Syamlal::~Syamlal()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::kineticTheoryModels::viscosityModels::Syamlal::mua
+Foam::kineticTheoryModels::viscosityModels::Syamlal::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1.0)*sqr(alpha)/(3.0 - e)
-      + (1.0/6.0)*alpha*sqrtPi/(3.0 - e)
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1.0)*sqr(alpha1)/(3.0 - e)
+      + (1.0/6.0)*alpha1*sqrtPi/(3.0 - e)
     );
 }
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
index 9d784aeeb25825d3f5326b0d4c73247137cd8cb0..b9c8d6e4e3d3a91c85e022e335791ae05e479af2 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
@@ -72,12 +72,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index 36f4bab76a55c1bc8ac8fbc0f7c9b3abb920c9cd..9be0466936e91e7a317046fb563517feae479c09 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -53,12 +53,12 @@ Foam::kineticTheoryModels::noneViscosity::~noneViscosity()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mua
+Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const volScalarField& da,
     const dimensionedScalar& e
 ) const
@@ -68,7 +68,7 @@ Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mua
         "0",
         dimensionSet(1, -1, -1, 0, 0, 0, 0),
         0.0
-    )*alpha;
+    )*alpha1;
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
index 22f60d960283c17537a6d938c3d7eef258fceb13..c4382a2c5fcd772c5d9df8c059cfc8c0093b62bd 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
@@ -70,12 +70,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index 903093822028dee13cb957d557a9eb3b8aec8fab..179da0e940eae6de2f61453ee9660621956735de 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -106,12 +106,12 @@ public:
 
     // Member Functions
 
-        virtual tmp<volScalarField> mua
+        virtual tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const volScalarField& da,
             const dimensionedScalar& e
         ) const = 0;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 675a410a167c197c7bfe59de0b0cbbde53ba726e..0625de8d91c240bc1ec4d2854072520c32fe8e5d 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -25,8 +25,8 @@
     // }
 
     PtrList<surfaceScalarField> alphafs(fluid.phases().size());
-    PtrList<volVectorField> U0s(fluid.phases().size());
-    PtrList<surfaceScalarField> phi0s(fluid.phases().size());
+    PtrList<volVectorField> HbyAs(fluid.phases().size());
+    PtrList<surfaceScalarField> phiHbyAs(fluid.phases().size());
     PtrList<volScalarField> rAUs(fluid.phases().size());
     PtrList<surfaceScalarField> rAlphaAUfs(fluid.phases().size());
 
@@ -35,26 +35,28 @@
     {
         phaseModel& phase = iter();
 
-        U0s.set(phasei, new volVectorField(phase.U()));
-        phi0s.set(phasei, new surfaceScalarField(phase.phi()));
-        mrfZones.absoluteFlux(phi0s[phasei]);
+        phase.phi().oldTime();
+        mrfZones.absoluteFlux(phase.phi().oldTime());
+        mrfZones.absoluteFlux(phase.phi());
 
-        phasei++;
+        HbyAs.set(phasei, new volVectorField(phase.U()));
+        phiHbyAs.set(phasei, new surfaceScalarField(1.0*phase.phi()));
 
+        phasei++;
     }
 
-    surfaceScalarField phi0
+    surfaceScalarField phiHbyA
     (
         IOobject
         (
-            "phi0",
+            "phiHbyA",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("phi0", dimArea*dimVelocity, 0)
+        dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
     );
 
     phasei = 0;
@@ -67,20 +69,15 @@
         rAUs.set(phasei, (1.0/UEqns[phasei].A()).ptr());
         rAlphaAUfs.set(phasei, fvc::interpolate(alpha*rAUs[phasei]).ptr());
 
-        phase.U() = rAUs[phasei]*UEqns[phasei].H();
+        HbyAs[phasei] = rAUs[phasei]*UEqns[phasei].H();
 
-        phase.phi().oldTime();
-        mrfZones.absoluteFlux(phase.phi().oldTime());
-        mrfZones.absoluteFlux(phase.phi());
-        phase.phi() =
+        phiHbyAs[phasei] =
         (
-            (fvc::interpolate(phase.U()) & mesh.Sf())
+            (fvc::interpolate(HbyAs[phasei]) & mesh.Sf())
           + fvc::ddtPhiCorr(rAUs[phasei], alpha, phase.U(), phase.phi())
+          + rAlphaAUfs[phasei]*(g & mesh.Sf())
         );
-        mrfZones.relativeFlux(phase.phi());
-        mrfZones.relativeFlux(phase.phi().oldTime());
-        surfaceScalarField pphi0("pphi0", 1.0*phase.phi());
-        pphi0 += rAlphaAUfs[phasei]*(g & mesh.Sf());
+        mrfZones.relativeFlux(phiHbyAs[phasei]);
 
         multiphaseSystem::dragModelTable::const_iterator dmIter =
             fluid.dragModels().begin();
@@ -93,46 +90,36 @@
             ++dmIter, ++dcIter
         )
         {
-            if
-            (
-                &phase == &dmIter()->phase1()
-             || &phase == &dmIter()->phase2()
-            )
+            const phaseModel *phase2Ptr = &dmIter()->phase2();
+            if (phase2Ptr == &phase)
             {
-                int phasej = 0;
-                forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter2)
-                {
-                    phaseModel& phase2 = iter2();
-
-                    if
-                    (
-                        (
-                            &phase == &dmIter()->phase1()
-                         && &phase2 == &dmIter()->phase2()
-                        )
-                     || (
-                            &phase == &dmIter()->phase2()
-                         && &phase2 == &dmIter()->phase1()
-                        )
-                    ) break;
-
-                    phasej++;
-                }
-
-                pphi0 +=
-                    fvc::interpolate
-                    ((1.0/phase.rho())*rAUs[phasei]*(*dcIter()))
-                   *phi0s[phasej];
+                phase2Ptr = &dmIter()->phase1();
             }
+
+            phiHbyAs[phasei] +=
+                fvc::interpolate
+                (
+                    (1.0/phase.rho())*rAUs[phasei]*(*dcIter())
+                )*phase2Ptr->phi();
+
+            HbyAs[phasei] +=
+                (1.0/phase.rho())*rAUs[phasei]*(*dcIter())
+               *phase2Ptr->U();
+
+            // HbyAs[phasei] += fvc::reconstruct
+            // (
+            //     fvc::interpolate
+            //     (
+            //         (1.0/phase.rho())*rAUs[phasei]*(*dcIter())
+            //     )*phase2Ptr->phi()
+            // );
         }
 
-        phi0 += alphafs[phasei]*pphi0;
-        phase.phi() = pphi0;
+        phiHbyA += alphafs[phasei]*phiHbyAs[phasei];
 
         phasei++;
     }
 
-    phi = dimensionedScalar("phi", phi.dimensions(), 0);
     surfaceScalarField Dp
     (
         IOobject
@@ -149,7 +136,6 @@
     forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
     {
         phaseModel& phase = iter();
-        phi += alphafs[phasei]*phase.phi();
         Dp += alphafs[phasei]*rAlphaAUfs[phasei]/phase.rho();
 
         phasei++;
@@ -160,7 +146,7 @@
     {
         fvScalarMatrix pEqnIncomp
         (
-            fvc::div(phi0)
+            fvc::div(phiHbyA)
           - fvm::laplacian(Dp, p)
         );
 
@@ -184,7 +170,11 @@
             {
                 phaseModel& phase = iter();
 
-                phase.phi() += rAlphaAUfs[phasei]*mSfGradp/phase.rho();
+                phase.phi() =
+                    phiHbyAs[phasei]
+                  + rAlphaAUfs[phasei]*mSfGradp/phase.rho();
+                mrfZones.relativeFlux(phase.phi());
+                mrfZones.relativeFlux(phase.phi().oldTime());
                 phi += alphafs[phasei]*phase.phi();
 
                 phasei++;
@@ -208,70 +198,15 @@
                 phaseModel& phase = iter();
                 const volScalarField& alpha = phase;
 
-                phase.U() +=
-                    fvc::reconstruct
+                phase.U() =
+                    HbyAs[phasei]
+                  + fvc::reconstruct
                     (
                         rAlphaAUfs[phasei]*(g & mesh.Sf())
                       + rAlphaAUfs[phasei]*mSfGradp/phase.rho()
                     );
 
-                multiphaseSystem::dragModelTable::const_iterator dmIter =
-                    fluid.dragModels().begin();
-                multiphaseSystem::dragCoeffFields::const_iterator dcIter =
-                    dragCoeffs().begin();
-                for
-                (
-                    ;
-                    dmIter != fluid.dragModels().end()
-                 && dcIter != dragCoeffs().end();
-                    ++dmIter, ++dcIter
-                )
-                {
-                    if
-                    (
-                        &phase == &dmIter()->phase1()
-                     || &phase == &dmIter()->phase2()
-                    )
-                    {
-                        int phasej = 0;
-                        forAllIter
-                        (
-                            PtrDictionary<phaseModel>,
-                            fluid.phases(),
-                            iter2
-                        )
-                        {
-                            phaseModel& phase2 = iter2();
-
-                            if
-                            (
-                                (
-                                    &phase == &dmIter()->phase1()
-                                 && &phase2 == &dmIter()->phase2()
-                                )
-                             || (
-                                    &phase == &dmIter()->phase2()
-                                 && &phase2 == &dmIter()->phase1()
-                                 )
-                            ) break;
-
-                            phasej++;
-                        }
-
-                        // phase.U() +=
-                        //     (1.0/phase.rho())*rAUs[phasei]*(*dcIter())
-                        //    *U0s[phasej];
-
-                        phase.U() += fvc::reconstruct
-                        (
-                            fvc::interpolate
-                            (
-                                (1.0/phase.rho())*rAUs[phasei]*(*dcIter())
-                            )*phi0s[phasej]
-                        );
-                    }
-                }
-
+                phase.U() = fvc::reconstruct(phase.phi());
                 phase.U().correctBoundaryConditions();
 
                 U += alpha*phase.U();
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H
index ae6a13feb06fb051428dde4f1fb62fdd3c52e1ef..4433c5cde4acbea8fb992d02c9b8e4d316976973 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H
@@ -3,7 +3,7 @@
 {
     scalar UrCoNum = 0.5*gMax
     (
-        fvc::surfaceSum(mag(phia - phib))().internalField()/mesh.V().field()
+        fvc::surfaceSum(mag(phi1 - phi2))().internalField()/mesh.V().field()
     )*runTime.deltaTValue();
 
     Info<< "Max Ur Courant Number = " << UrCoNum << endl;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H b/applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H
index a5aad71f41d8edc7329544100469e871a514fb54..96b6a63a435d405e0d0bd4d5e80ef656b8e620d9 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H
@@ -1,11 +1,11 @@
 {
-    DDtUa =
-        fvc::ddt(Ua)
-      + fvc::div(phia, Ua)
-      - fvc::div(phia)*Ua;
+    DDtU1 =
+        fvc::ddt(U1)
+      + fvc::div(phi1, U1)
+      - fvc::div(phi1)*U1;
 
-    DDtUb =
-        fvc::ddt(Ub)
-      + fvc::div(phib, Ub)
-      - fvc::div(phib)*Ub;
+    DDtU2 =
+        fvc::ddt(U2)
+      + fvc::div(phi2, U2)
+      - fvc::div(phi2)*U2;
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/UEqns.H
index 2aba5b9d3d0fe20bcb2a031179e84a9848394922..0c0cc1543a7a5aad203013d0ed97b15505121f36 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/UEqns.H
@@ -1,99 +1,99 @@
-fvVectorMatrix UaEqn(Ua, Ua.dimensions()*dimVol/dimTime);
-fvVectorMatrix UbEqn(Ub, Ub.dimensions()*dimVol/dimTime);
+fvVectorMatrix U1Eqn(U1, U1.dimensions()*dimVol/dimTime);
+fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
 
 {
     {
-        volTensorField gradUaT(T(fvc::grad(Ua)));
+        volTensorField gradU1T(T(fvc::grad(U1)));
 
         if (kineticTheory.on())
         {
-            kineticTheory.solve(gradUaT);
-            nuEffa = kineticTheory.mua()/rhoa;
+            kineticTheory.solve(gradU1T);
+            nuEff1 = kineticTheory.mu1()/rho1;
         }
         else // If not using kinetic theory is using Ct model
         {
-            nuEffa = sqr(Ct)*nutb + nua;
+            nuEff1 = sqr(Ct)*nut2 + nu1;
         }
 
-        volTensorField Rca
+        volTensorField Rc1
         (
-            "Rca",
-            (((2.0/3.0)*I)*nuEffa)*tr(gradUaT) - nuEffa*gradUaT
+            "Rc1",
+            (((2.0/3.0)*I)*nuEff1)*tr(gradU1T) - nuEff1*gradU1T
         );
 
         if (kineticTheory.on())
         {
-            Rca -= ((kineticTheory.lambda()/rhoa)*tr(gradUaT))*tensor(I);
+            Rc1 -= ((kineticTheory.lambda()/rho1)*tr(gradU1T))*tensor(I);
         }
 
-        surfaceScalarField phiRa
+        surfaceScalarField phiR1
         (
-            -fvc::interpolate(nuEffa)*mesh.magSf()*fvc::snGrad(alpha)
-            /fvc::interpolate(alpha + scalar(0.001))
+            -fvc::interpolate(nuEff1)*mesh.magSf()*fvc::snGrad(alpha1)
+            /fvc::interpolate(alpha1 + scalar(0.001))
         );
 
-        UaEqn =
+        U1Eqn =
         (
-            (scalar(1) + Cvm*rhob*beta/rhoa)*
+            (scalar(1) + Cvm*rho2*alpha2/rho1)*
             (
-                fvm::ddt(Ua)
-              + fvm::div(phia, Ua, "div(phia,Ua)")
-              - fvm::Sp(fvc::div(phia), Ua)
+                fvm::ddt(U1)
+              + fvm::div(phi1, U1, "div(phi1,U1)")
+              - fvm::Sp(fvc::div(phi1), U1)
             )
 
-          - fvm::laplacian(nuEffa, Ua)
-          + fvc::div(Rca)
+          - fvm::laplacian(nuEff1, U1)
+          + fvc::div(Rc1)
 
-          + fvm::div(phiRa, Ua, "div(phia,Ua)")
-          - fvm::Sp(fvc::div(phiRa), Ua)
-          + (fvc::grad(alpha)/(fvc::average(alpha) + scalar(0.001)) & Rca)
+          + fvm::div(phiR1, U1, "div(phi1,U1)")
+          - fvm::Sp(fvc::div(phiR1), U1)
+          + (fvc::grad(alpha1)/(fvc::average(alpha1) + scalar(0.001)) & Rc1)
          ==
         //  g                          // Buoyancy term transfered to p-equation
-          - fvm::Sp(beta/rhoa*K, Ua)
-        //+ beta/rhoa*K*Ub             // Explicit drag transfered to p-equation
-          - beta/rhoa*(liftCoeff - Cvm*rhob*DDtUb)
+          - fvm::Sp(alpha2/rho1*K, U1)
+        //+ alpha2/rho1*K*U2           // Explicit drag transfered to p-equation
+          - alpha2/rho1*(liftCoeff - Cvm*rho2*DDtU2)
         );
-        mrfZones.addCoriolis(UaEqn);
-        UaEqn.relax();
+        mrfZones.addCoriolis(U1Eqn);
+        U1Eqn.relax();
     }
 
     {
-        volTensorField gradUbT(T(fvc::grad(Ub)));
-        volTensorField Rcb
+        volTensorField gradU2T(T(fvc::grad(U2)));
+        volTensorField Rc2
         (
-            "Rcb",
-            (((2.0/3.0)*I)*nuEffb)*tr(gradUbT) - nuEffb*gradUbT
+            "Rc2",
+            (((2.0/3.0)*I)*nuEff2)*tr(gradU2T) - nuEff2*gradU2T
         );
 
-        surfaceScalarField phiRb
+        surfaceScalarField phiR2
         (
-            -fvc::interpolate(nuEffb)*mesh.magSf()*fvc::snGrad(beta)
-            /fvc::interpolate(beta + scalar(0.001))
+            -fvc::interpolate(nuEff2)*mesh.magSf()*fvc::snGrad(alpha2)
+            /fvc::interpolate(alpha2 + scalar(0.001))
         );
 
-        UbEqn =
+        U2Eqn =
         (
-            (scalar(1) + Cvm*rhob*alpha/rhob)*
+            (scalar(1) + Cvm*rho2*alpha1/rho2)*
             (
-                fvm::ddt(Ub)
-              + fvm::div(phib, Ub, "div(phib,Ub)")
-              - fvm::Sp(fvc::div(phib), Ub)
+                fvm::ddt(U2)
+              + fvm::div(phi2, U2, "div(phi2,U2)")
+              - fvm::Sp(fvc::div(phi2), U2)
             )
 
-          - fvm::laplacian(nuEffb, Ub)
-          + fvc::div(Rcb)
+          - fvm::laplacian(nuEff2, U2)
+          + fvc::div(Rc2)
 
-          + fvm::div(phiRb, Ub, "div(phib,Ub)")
-          - fvm::Sp(fvc::div(phiRb), Ub)
+          + fvm::div(phiR2, U2, "div(phi2,U2)")
+          - fvm::Sp(fvc::div(phiR2), U2)
 
-          + (fvc::grad(beta)/(fvc::average(beta) + scalar(0.001)) & Rcb)
+          + (fvc::grad(alpha2)/(fvc::average(alpha2) + scalar(0.001)) & Rc2)
          ==
         //  g                          // Buoyancy term transfered to p-equation
-          - fvm::Sp(alpha/rhob*K, Ub)
-        //+ alpha/rhob*K*Ua            // Explicit drag transfered to p-equation
-          + alpha/rhob*(liftCoeff + Cvm*rhob*DDtUa)
+          - fvm::Sp(alpha1/rho2*K, U2)
+        //+ alpha1/rho2*K*U1           // Explicit drag transfered to p-equation
+          + alpha1/rho2*(liftCoeff + Cvm*rho2*DDtU1)
         );
-        mrfZones.addCoriolis(UbEqn);
-        UbEqn.relax();
+        mrfZones.addCoriolis(U2Eqn);
+        U2Eqn.relax();
     }
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
index 0d653536241a3c3bb118bdb35511f43214bf5287..2fc0eff9ebac896890c1e0e48f9a7da5edde77e3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
@@ -1,3 +1,3 @@
     MRFZones mrfZones(mesh);
-    mrfZones.correctBoundaryVelocity(Ua);
-    mrfZones.correctBoundaryVelocity(Ub);
+    mrfZones.correctBoundaryVelocity(U1);
+    mrfZones.correctBoundaryVelocity(U2);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H
index d89136b17210ab7a073b2a70738704c8415d5c91..fc8df54ecd917967a52d26afa382fa56f43f19e7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H
@@ -1,44 +1,44 @@
 {
-    surfaceScalarField alphaf(fvc::interpolate(alpha));
-    surfaceScalarField betaf(scalar(1) - alphaf);
+    surfaceScalarField alpha1f(fvc::interpolate(alpha1));
+    surfaceScalarField alpha2f(scalar(1) - alpha1f);
 
-    volScalarField rUaA(1.0/UaEqn.A());
-    volScalarField rUbA(1.0/UbEqn.A());
+    volScalarField rAU1(1.0/U1Eqn.A());
+    volScalarField rAU2(1.0/U2Eqn.A());
 
-    rUaAf = fvc::interpolate(rUaA);
-    surfaceScalarField rUbAf(fvc::interpolate(rUbA));
+    rAU1f = fvc::interpolate(rAU1);
+    surfaceScalarField rAU2f(fvc::interpolate(rAU2));
 
-    volVectorField HbyAa("HbyAa", Ua);
-    HbyAa = rUaA*UaEqn.H();
+    volVectorField HbyA1("HbyA1", U1);
+    HbyA1 = rAU1*U1Eqn.H();
 
-    volVectorField HbyAb("HbyAb", Ub);
-    HbyAb = rUbA*UbEqn.H();
+    volVectorField HbyA2("HbyA2", U2);
+    HbyA2 = rAU2*U2Eqn.H();
 
-    mrfZones.absoluteFlux(phia.oldTime());
-    mrfZones.absoluteFlux(phia);
+    mrfZones.absoluteFlux(phi1.oldTime());
+    mrfZones.absoluteFlux(phi1);
 
-    mrfZones.absoluteFlux(phib.oldTime());
-    mrfZones.absoluteFlux(phib);
+    mrfZones.absoluteFlux(phi2.oldTime());
+    mrfZones.absoluteFlux(phi2);
 
-    surfaceScalarField phiDraga
+    surfaceScalarField phiDrag1
     (
-        fvc::interpolate(beta/rhoa*K*rUaA)*phib + rUaAf*(g & mesh.Sf())
+        fvc::interpolate(alpha2/rho1*K*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
     );
 
     if (g0.value() > 0.0)
     {
-        phiDraga -= ppMagf*fvc::snGrad(alpha)*mesh.magSf();
+        phiDrag1 -= ppMagf*fvc::snGrad(alpha1)*mesh.magSf();
     }
 
     if (kineticTheory.on())
     {
-        phiDraga -= rUaAf*fvc::snGrad(kineticTheory.pa()/rhoa)*mesh.magSf();
+        phiDrag1 -= rAU1f*fvc::snGrad(kineticTheory.pa()/rho1)*mesh.magSf();
     }
 
 
-    surfaceScalarField phiDragb
+    surfaceScalarField phiDrag2
     (
-        fvc::interpolate(alpha/rhob*K*rUbA)*phia + rUbAf*(g & mesh.Sf())
+        fvc::interpolate(alpha1/rho2*K*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
     );
 
     // Fix for gravity on outlet boundary.
@@ -46,35 +46,35 @@
     {
         if (isA<zeroGradientFvPatchScalarField>(p.boundaryField()[patchi]))
         {
-            phiDraga.boundaryField()[patchi] = 0.0;
-            phiDragb.boundaryField()[patchi] = 0.0;
+            phiDrag1.boundaryField()[patchi] = 0.0;
+            phiDrag2.boundaryField()[patchi] = 0.0;
         }
     }
 
-    surfaceScalarField phiHbyAa
+    surfaceScalarField phiHbyA1
     (
-        "phiHbyAa",
-        (fvc::interpolate(HbyAa) & mesh.Sf())
-      + fvc::ddtPhiCorr(rUaA, Ua, phia)
-      + phiDraga
+        "phiHbyA1",
+        (fvc::interpolate(HbyA1) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU1, U1, phi1)
+      + phiDrag1
     );
-    mrfZones.relativeFlux(phiHbyAa);
+    mrfZones.relativeFlux(phiHbyA1);
 
-    surfaceScalarField phiHbyAb
+    surfaceScalarField phiHbyA2
     (
-        "phiHbyAb",
-        (fvc::interpolate(HbyAb) & mesh.Sf())
-      + fvc::ddtPhiCorr(rUbA, Ub, phib)
-      + phiDragb
+        "phiHbyA2",
+        (fvc::interpolate(HbyA2) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU2, U2, phi2)
+      + phiDrag2
     );
-    mrfZones.relativeFlux(phiHbyAb);
+    mrfZones.relativeFlux(phiHbyA2);
 
-    surfaceScalarField phiHbyA("phiHbyA", alphaf*phiHbyAa + betaf*phiHbyAb);
+    surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
     surfaceScalarField Dp
     (
         "Dp",
-        alphaf*rUaAf/rhoa + betaf*rUbAf/rhob
+        alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
     );
 
     while (pimple.correctNonOrthogonal())
@@ -92,28 +92,28 @@
         {
             surfaceScalarField SfGradp(pEqn.flux()/Dp);
 
-            phia.boundaryField() ==
-                (fvc::interpolate(Ua) & mesh.Sf())().boundaryField();
-            mrfZones.relativeFlux(phia);
-            phia = phiHbyAa - rUaAf*SfGradp/rhoa;
+            phi1.boundaryField() ==
+                (fvc::interpolate(U1) & mesh.Sf())().boundaryField();
+            mrfZones.relativeFlux(phi1);
+            phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
 
-            phib.boundaryField() ==
-                (fvc::interpolate(Ub) & mesh.Sf())().boundaryField();
-            mrfZones.relativeFlux(phib);
-            phib = phiHbyAb - rUbAf*SfGradp/rhob;
+            phi2.boundaryField() ==
+                (fvc::interpolate(U2) & mesh.Sf())().boundaryField();
+            mrfZones.relativeFlux(phi2);
+            phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
 
-            phi = alphaf*phia + betaf*phib;
+            phi = alpha1f*phi1 + alpha2f*phi2;
 
             p.relax();
             SfGradp = pEqn.flux()/Dp;
 
-            Ua = HbyAa + fvc::reconstruct(phiDraga - rUaAf*SfGradp/rhoa);
-            Ua.correctBoundaryConditions();
+            U1 = HbyA1 + fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1);
+            U1.correctBoundaryConditions();
 
-            Ub = HbyAb + fvc::reconstruct(phiDragb - rUbAf*SfGradp/rhob);
-            Ub.correctBoundaryConditions();
+            U2 = HbyA2 + fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2);
+            U2.correctBoundaryConditions();
 
-            U = alpha*Ua + beta*Ub;
+            U = alpha1*U1 + alpha2*U2;
         }
     }
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
index a4d428e176eebc2bf774926c6b2b04b82dd2b5e7..8d09ccd3ef0c74db4cc9ef096eca61d0747ddb77 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
@@ -1,99 +1,99 @@
-fvVectorMatrix UaEqn(Ua, Ua.dimensions()*dimVol/dimTime);
-fvVectorMatrix UbEqn(Ub, Ub.dimensions()*dimVol/dimTime);
+fvVectorMatrix U1Eqn(U1, U1.dimensions()*dimVol/dimTime);
+fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
 
 {
     {
-        volTensorField gradUaT(T(fvc::grad(Ua)));
+        volTensorField gradU1T(T(fvc::grad(U1)));
 
         if (kineticTheory.on())
         {
-            kineticTheory.solve(gradUaT);
-            nuEffa = kineticTheory.mua()/rhoa;
+            kineticTheory.solve(gradU1T);
+            nuEff1 = kineticTheory.mu1()/rho1;
         }
         else // If not using kinetic theory is using Ct model
         {
-            nuEffa = sqr(Ct)*nutb + nua;
+            nuEff1 = sqr(Ct)*nut2 + nu1;
         }
 
-        volTensorField Rca
+        volTensorField Rc1
         (
-            "Rca",
-            (((2.0/3.0)*I)*nuEffa)*tr(gradUaT) - nuEffa*gradUaT
+            "Rc1",
+            (((2.0/3.0)*I)*nuEff1)*tr(gradU1T) - nuEff1*gradU1T
         );
 
         if (kineticTheory.on())
         {
-            Rca -= ((kineticTheory.lambda()/rhoa)*tr(gradUaT))*tensor(I);
+            Rc1 -= ((kineticTheory.lambda()/rho1)*tr(gradU1T))*tensor(I);
         }
 
-        surfaceScalarField phiRa
+        surfaceScalarField phiR1
         (
-            -fvc::interpolate(nuEffa)*mesh.magSf()*fvc::snGrad(alpha)
-            /fvc::interpolate(alpha + scalar(0.001))
+            -fvc::interpolate(nuEff1)*mesh.magSf()*fvc::snGrad(alpha1)
+            /fvc::interpolate(alpha1 + scalar(0.001))
         );
 
-        UaEqn =
+        U1Eqn =
         (
-            (scalar(1) + Cvm*rhob*beta/rhoa)*
+            (scalar(1) + Cvm*rho2*alpha2/rho1)*
             (
-                fvm::ddt(Ua)
-              + fvm::div(phia, Ua, "div(phia,Ua)")
-              - fvm::Sp(fvc::div(phia), Ua)
+                fvm::ddt(U1)
+              + fvm::div(phi1, U1, "div(phi1,U1)")
+              - fvm::Sp(fvc::div(phi1), U1)
             )
 
-          - fvm::laplacian(nuEffa, Ua)
-          + fvc::div(Rca)
+          - fvm::laplacian(nuEff1, U1)
+          + fvc::div(Rc1)
 
-          + fvm::div(phiRa, Ua, "div(phia,Ua)")
-          - fvm::Sp(fvc::div(phiRa), Ua)
-          + (fvc::grad(alpha)/(fvc::average(alpha) + scalar(0.001)) & Rca)
+          + fvm::div(phiR1, U1, "div(phi1,U1)")
+          - fvm::Sp(fvc::div(phiR1), U1)
+          + (fvc::grad(alpha1)/(fvc::average(alpha1) + scalar(0.001)) & Rc1)
          ==
         //  g                          // Buoyancy term transfered to p-equation
-          - fvm::Sp(beta/rhoa*K, Ua)
-        //+ beta/rhoa*K*Ub             // Explicit drag transfered to p-equation
-          - beta/rhoa*(liftCoeff - Cvm*rhob*DDtUb)
+          - fvm::Sp(alpha2/rho1*K, U1)
+        //+ alpha2/rho1*K*U2           // Explicit drag transfered to p-equation
+          - alpha2/rho1*(liftCoeff - Cvm*rho2*DDtU2)
         );
 
-        UaEqn.relax();
+        U1Eqn.relax();
     }
 
     {
-        volTensorField gradUbT(T(fvc::grad(Ub)));
-        volTensorField Rcb
+        volTensorField gradU2T(T(fvc::grad(U2)));
+        volTensorField Rc2
         (
-            "Rcb",
-            (((2.0/3.0)*I)*nuEffb)*tr(gradUbT) - nuEffb*gradUbT
+            "Rc2",
+            (((2.0/3.0)*I)*nuEff2)*tr(gradU2T) - nuEff2*gradU2T
         );
 
-        surfaceScalarField phiRb
+        surfaceScalarField phiR2
         (
-            -fvc::interpolate(nuEffb)*mesh.magSf()*fvc::snGrad(beta)
-            /fvc::interpolate(beta + scalar(0.001))
+            -fvc::interpolate(nuEff2)*mesh.magSf()*fvc::snGrad(alpha2)
+            /fvc::interpolate(alpha2 + scalar(0.001))
         );
 
-        UbEqn =
+        U2Eqn =
         (
-            (scalar(1) + Cvm*rhob*alpha/rhob)*
+            (scalar(1) + Cvm*rho2*alpha1/rho2)*
             (
-                fvm::ddt(Ub)
-              + fvm::div(phib, Ub, "div(phib,Ub)")
-              - fvm::Sp(fvc::div(phib), Ub)
+                fvm::ddt(U2)
+              + fvm::div(phi2, U2, "div(phi2,U2)")
+              - fvm::Sp(fvc::div(phi2), U2)
             )
 
-          - fvm::laplacian(nuEffb, Ub)
-          + fvc::div(Rcb)
+          - fvm::laplacian(nuEff2, U2)
+          + fvc::div(Rc2)
 
-          + fvm::div(phiRb, Ub, "div(phib,Ub)")
-          - fvm::Sp(fvc::div(phiRb), Ub)
+          + fvm::div(phiR2, U2, "div(phi2,U2)")
+          - fvm::Sp(fvc::div(phiR2), U2)
 
-          + (fvc::grad(beta)/(fvc::average(beta) + scalar(0.001)) & Rcb)
+          + (fvc::grad(alpha2)/(fvc::average(alpha2) + scalar(0.001)) & Rc2)
          ==
         //  g                          // Buoyancy term transfered to p-equation
-          - fvm::Sp(alpha/rhob*K, Ub)
-        //+ alpha/rhob*K*Ua            // Explicit drag transfered to p-equation
-          + alpha/rhob*(liftCoeff + Cvm*rhob*DDtUa)
+          - fvm::Sp(alpha1/rho2*K, U2)
+        //+ alpha1/rho2*K*U1           // Explicit drag transfered to p-equation
+          + alpha1/rho2*(liftCoeff + Cvm*rho2*DDtU1)
         );
 
-        UbEqn.relax();
+        U2Eqn.relax();
     }
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
index 8f1ad9df8e3387677a5e4d1b9f61e88236dd3524..126bffbdf437648fad8c10d05b45abbbe46c769a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
@@ -1,56 +1,56 @@
 {
-    word scheme("div(phi,alpha)");
-    word schemer("div(phir,alpha)");
+    word scheme("div(phi,alpha1)");
+    word schemer("div(phir,alpha1)");
 
     surfaceScalarField phic("phic", phi);
-    surfaceScalarField phir("phir", phia - phib);
+    surfaceScalarField phir("phir", phi1 - phi2);
 
     if (g0.value() > 0.0)
     {
-        surfaceScalarField alphaf(fvc::interpolate(alpha));
-        surfaceScalarField phipp(ppMagf*fvc::snGrad(alpha)*mesh.magSf());
+        surfaceScalarField alpha1f(fvc::interpolate(alpha1));
+        surfaceScalarField phipp(ppMagf*fvc::snGrad(alpha1)*mesh.magSf());
         phir += phipp;
-        phic += fvc::interpolate(alpha)*phipp;
+        phic += fvc::interpolate(alpha1)*phipp;
     }
 
     for (int acorr=0; acorr<nAlphaCorr; acorr++)
     {
-        fvScalarMatrix alphaEqn
+        fvScalarMatrix alpha1Eqn
         (
-             fvm::ddt(alpha)
-           + fvm::div(phic, alpha, scheme)
-           + fvm::div(-fvc::flux(-phir, beta, schemer), alpha, schemer)
+             fvm::ddt(alpha1)
+           + fvm::div(phic, alpha1, scheme)
+           + fvm::div(-fvc::flux(-phir, alpha2, schemer), alpha1, schemer)
         );
 
         if (g0.value() > 0.0)
         {
-            ppMagf = rUaAf*fvc::interpolate
+            ppMagf = rAU1f*fvc::interpolate
             (
-                (1.0/(rhoa*(alpha + scalar(0.0001))))
-               *g0*min(exp(preAlphaExp*(alpha - alphaMax)), expMax)
+                (1.0/(rho1*(alpha1 + scalar(0.0001))))
+               *g0*min(exp(preAlphaExp*(alpha1 - alpha1Max)), expMax)
             );
 
-            alphaEqn -= fvm::laplacian
+            alpha1Eqn -= fvm::laplacian
             (
-                (fvc::interpolate(alpha) + scalar(0.0001))*ppMagf,
-                alpha,
-                "laplacian(alphaPpMag,alpha)"
+                (fvc::interpolate(alpha1) + scalar(0.0001))*ppMagf,
+                alpha1,
+                "laplacian(alpha1PpMag,alpha1)"
             );
         }
 
-        alphaEqn.relax();
-        alphaEqn.solve();
+        alpha1Eqn.relax();
+        alpha1Eqn.solve();
 
         #include "packingLimiter.H"
 
-        beta = scalar(1) - alpha;
+        alpha2 = scalar(1) - alpha1;
 
         Info<< "Dispersed phase volume fraction = "
-            << alpha.weightedAverage(mesh.V()).value()
-            << "  Min(alpha) = " << min(alpha).value()
-            << "  Max(alpha) = " << max(alpha).value()
+            << alpha1.weightedAverage(mesh.V()).value()
+            << "  Min(alpha1) = " << min(alpha1).value()
+            << "  Max(alpha1) = " << max(alpha1).value()
             << endl;
     }
 }
 
-rho = alpha*rhoa + beta*rhob;
+rho = alpha1*rho1 + alpha2*rho2;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index 076b14a713ef07d4609d7718d07e7838a4281818..b71c7849e5b456591f19ef931ae4f102b58fc54d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -12,36 +12,36 @@
         )
     );
 
-    autoPtr<phaseModel> phasea = phaseModel::New
+    autoPtr<phaseModel> phase1 = phaseModel::New
     (
         mesh,
         transportProperties,
-        "a"
+        "1"
     );
 
-    autoPtr<phaseModel> phaseb = phaseModel::New
+    autoPtr<phaseModel> phase2 = phaseModel::New
     (
         mesh,
         transportProperties,
-        "b"
+        "2"
     );
 
-    volVectorField& Ua = phasea->U();
-    surfaceScalarField& phia = phasea->phi();
-    const dimensionedScalar& rhoa = phasea->rho();
-    const dimensionedScalar& nua = phasea->nu();
+    volVectorField& U1 = phase1->U();
+    surfaceScalarField& phi1 = phase1->phi();
+    const dimensionedScalar& rho1 = phase1->rho();
+    const dimensionedScalar& nu1 = phase1->nu();
 
-    volVectorField& Ub = phaseb->U();
-    surfaceScalarField& phib = phaseb->phi();
-    const dimensionedScalar& rhob = phaseb->rho();
-    const dimensionedScalar& nub = phaseb->nu();
+    volVectorField& U2 = phase2->U();
+    surfaceScalarField& phi2 = phase2->phi();
+    const dimensionedScalar& rho2 = phase2->rho();
+    const dimensionedScalar& nu2 = phase2->nu();
 
-    Info<< "Reading field alpha\n" << endl;
-    volScalarField alpha
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "alpha",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -50,18 +50,18 @@
         mesh
     );
 
-    volScalarField beta
+    volScalarField alpha2
     (
         IOobject
         (
-            "beta",
+            "alpha2",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        scalar(1) - alpha
-        //,alpha.boundaryField().types()
+        scalar(1) - alpha1
+        //,alpha1.boundaryField().types()
     );
 
     Info<< "Reading field p\n" << endl;
@@ -88,7 +88,7 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        alpha*Ua + beta*Ub
+        alpha1*U1 + alpha2*U2
     );
 
     dimensionedScalar Cvm
@@ -116,7 +116,7 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        fvc::interpolate(alpha)*phia + fvc::interpolate(beta)*phib
+        fvc::interpolate(alpha1)*phi1 + fvc::interpolate(alpha2)*phi2
     );
 
     volScalarField rho
@@ -127,25 +127,25 @@
             runTime.timeName(),
             mesh
         ),
-        alpha*rhoa + beta*rhob
+        alpha1*rho1 + alpha2*rho2
     );
 
     #include "createRASTurbulence.H"
 
-    Info<< "Calculating field DDtUa and DDtUb\n" << endl;
+    Info<< "Calculating field DDtU1 and DDtU2\n" << endl;
 
-    volVectorField DDtUa
+    volVectorField DDtU1
     (
-        fvc::ddt(Ua)
-      + fvc::div(phia, Ua)
-      - fvc::div(phia)*Ua
+        fvc::ddt(U1)
+      + fvc::div(phi1, U1)
+      - fvc::div(phi1)*U1
     );
 
-    volVectorField DDtUb
+    volVectorField DDtU2
     (
-        fvc::ddt(Ub)
-      + fvc::div(phib, Ub)
-      - fvc::div(phib)*Ub
+        fvc::ddt(U2)
+      + fvc::div(phi2, U2)
+      - fvc::div(phi2)*U2
     );
 
 
@@ -164,20 +164,20 @@
         )
     );
 
-    autoPtr<dragModel> draga = dragModel::New
+    autoPtr<dragModel> drag1 = dragModel::New
     (
         interfacialProperties,
-        alpha,
-        phasea,
-        phaseb
+        alpha1,
+        phase1,
+        phase2
     );
 
-    autoPtr<dragModel> dragb = dragModel::New
+    autoPtr<dragModel> drag2 = dragModel::New
     (
         interfacialProperties,
-        beta,
-        phaseb,
-        phasea
+        alpha2,
+        phase2,
+        phase1
     );
 
     word dragPhase("blended");
@@ -186,7 +186,7 @@
         dragPhase = word(interfacialProperties.lookup("dragPhase"));
 
         bool validDrag =
-            dragPhase == "a" || dragPhase == "b" || dragPhase == "blended";
+            dragPhase == "1" || dragPhase == "2" || dragPhase == "blended";
 
         if (!validDrag)
         {
@@ -210,17 +210,17 @@
     Info << "dragPhase is " << dragPhase << endl;
     kineticTheoryModel kineticTheory
     (
-        phasea,
-        Ub,
-        alpha,
-        draga
+        phase1,
+        U2,
+        alpha1,
+        drag1
     );
 
-    surfaceScalarField rUaAf
+    surfaceScalarField rAU1f
     (
         IOobject
         (
-            "rUaAf",
+            "rAU1f",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
index 3feaaaee51edfec25fa7df6daeb0c178a40817f6..fa29439ae8c0d6055ba89e309313ed7ebb63cd65 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
@@ -46,12 +46,12 @@ namespace Foam
 Foam::Ergun::Ergun
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phasea, phaseb)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -68,12 +68,12 @@ Foam::tmp<Foam::volScalarField> Foam::Ergun::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
 
     return
-        150.0*alpha_*phaseb_.nu()*phaseb_.rho()
-       /sqr(beta*phasea_.d())
-      + 1.75*phaseb_.rho()*Ur/(beta*phasea_.d());
+        150.0*alpha1_*phase2_.nu()*phase2_.rho()
+       /sqr(alpha2*phase1_.d())
+      + 1.75*phase2_.rho()*Ur/(alpha2*phase1_.d());
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
index f9050cd6bdb5886ba517c09f379cd55a42caa5de..c1cdcb21aa1aba7b0f76438489b5242d209a8f59 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
@@ -66,9 +66,9 @@ public:
         Ergun
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index f02ac52bbff6eb2e9deedb282b0d8ab68df2e52a..6934e14aa1bba545435ed11f403814c414215e02 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -46,12 +46,12 @@ namespace Foam
 Foam::Gibilaro::Gibilaro
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phasea, phaseb)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -68,11 +68,11 @@ Foam::tmp<Foam::volScalarField> Foam::Gibilaro::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
-    volScalarField bp(pow(beta, -2.8));
-    volScalarField Re(max(beta*Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
+    volScalarField bp(pow(alpha2, -2.8));
+    volScalarField Re(max(alpha2*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
 
-    return (17.3/Re + scalar(0.336))*phaseb_.rho()*Ur*bp/phasea_.d();
+    return (17.3/Re + scalar(0.336))*phase2_.rho()*Ur*bp/phase1_.d();
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
index e6265ac16c090c4e861599a586c89e5cdcdacea4..a8dfd7843754f783e6826109288b17dfa5d8aa9e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
@@ -66,9 +66,9 @@ public:
         Gibilaro
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index ba464b3127329c93a564ad94dba7bd58a5e38852..60a79baa33a0b506bb752b75e414aeaeb34597a9 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -46,12 +46,12 @@ namespace Foam
 Foam::GidaspowErgunWenYu::GidaspowErgunWenYu
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phasea, phaseb)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -68,10 +68,10 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowErgunWenYu::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
 
-    volScalarField bp(pow(beta, -2.65));
-    volScalarField Re(max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
+    volScalarField bp(pow(alpha2, -2.65));
+    volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
 
     volScalarField Cds
     (
@@ -82,12 +82,12 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowErgunWenYu::K
     // Wen and Yu (1966)
     return
     (
-        pos(beta - 0.8)
-       *(0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d())
-      + neg(beta - 0.8)
+        pos(alpha2 - 0.8)
+       *(0.75*Cds*phase2_.rho()*Ur*bp/phase1_.d())
+      + neg(alpha2 - 0.8)
        *(
-           150.0*alpha_*phaseb_.nu()*phaseb_.rho()/(sqr(beta*phasea_.d()))
-         + 1.75*phaseb_.rho()*Ur/(beta*phasea_.d())
+           150.0*alpha1_*phase2_.nu()*phase2_.rho()/(sqr(alpha2*phase1_.d()))
+         + 1.75*phase2_.rho()*Ur/(alpha2*phase1_.d())
         )
     );
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
index 288a9068d51e47859c31a89c08dbfb5bc6b9b0c6..bec127589e8d3ed94663da52d5bf859fa7d22b03 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
@@ -64,9 +64,9 @@ public:
         GidaspowErgunWenYu
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index 2974cdb6d01062535092dccd50155728f7ea8878..6a47bdd185d982c1aec6e6ee90e410fddec2178f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -46,12 +46,12 @@ namespace Foam
 Foam::GidaspowSchillerNaumann::GidaspowSchillerNaumann
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phasea, phaseb)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -68,10 +68,10 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowSchillerNaumann::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1e-6)));
-    volScalarField bp(pow(beta, -2.65));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1e-6)));
+    volScalarField bp(pow(alpha2, -2.65));
 
-    volScalarField Re(max(beta*Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
+    volScalarField Re(max(alpha2*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
 
     volScalarField Cds
     (
@@ -79,7 +79,7 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowSchillerNaumann::K
       + pos(Re - 1000)*0.44
     );
 
-    return 0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d();
+    return 0.75*Cds*phase2_.rho()*Ur*bp/phase1_.d();
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
index 797aa4bf6db04dceeb3fbd34b26084e5b914bf4c..39347b0320e917ace709aa1aef180047507f8a58 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
@@ -73,9 +73,9 @@ public:
         GidaspowSchillerNaumann
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 13412679bd9f571e401fb1b31664ba2ae43cc2db..f822455fd92494c3dfbaef1900fca4f18e685040 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -46,12 +46,12 @@ namespace Foam
 Foam::SchillerNaumann::SchillerNaumann
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phasea, phaseb)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -68,7 +68,7 @@ Foam::tmp<Foam::volScalarField> Foam::SchillerNaumann::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField Re(max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
+    volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
 
     volScalarField Cds
     (
@@ -76,7 +76,7 @@ Foam::tmp<Foam::volScalarField> Foam::SchillerNaumann::K
       + pos(Re - 1000)*0.44
     );
 
-    return 0.75*Cds*phaseb_.rho()*Ur/phasea_.d();
+    return 0.75*Cds*phase2_.rho()*Ur/phase1_.d();
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
index 7dcf2422a7559bcb873af47eb680413cc6497dc5..3369abbf51582b099ddaaf2517527aeee0616b44 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
@@ -62,9 +62,9 @@ public:
         SchillerNaumann
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index b491eb9f83593b0b28e9ad34e7223824d82cd972..a74b8c3a2f0b2492a447909732510b6a1f4b73eb 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -46,12 +46,12 @@ namespace Foam
 Foam::SyamlalOBrien::SyamlalOBrien
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phasea, phaseb)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -68,15 +68,15 @@ Foam::tmp<Foam::volScalarField> Foam::SyamlalOBrien::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
-    volScalarField A(pow(beta, 4.14));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
+    volScalarField A(pow(alpha2, 4.14));
     volScalarField B
     (
-        neg(beta - 0.85)*(0.8*pow(beta, 1.28))
-      + pos(beta - 0.85)*(pow(beta, 2.65))
+        neg(alpha2 - 0.85)*(0.8*pow(alpha2, 1.28))
+      + pos(alpha2 - 0.85)*(pow(alpha2, 2.65))
     );
 
-    volScalarField Re(max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
+    volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
 
     volScalarField Vr
     (
@@ -88,7 +88,7 @@ Foam::tmp<Foam::volScalarField> Foam::SyamlalOBrien::K
 
     volScalarField Cds(sqr(0.63 + 4.8*sqrt(Vr/Re)));
 
-    return 0.75*Cds*phaseb_.rho()*Ur/(phasea_.d()*sqr(Vr));
+    return 0.75*Cds*phase2_.rho()*Ur/(phase1_.d()*sqr(Vr));
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
index 26f2d8a4e5c6d52bbef4ea6c4cdc9f5728579355..aaaebdd0fe7c24157f4daebaddb42e01f397aa2b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
@@ -65,9 +65,9 @@ public:
         SyamlalOBrien
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
index f1ace2213b7212490608febb2153b4a8824dd7e9..280c56d23ea0b447250e1c2214a27ef8e6d1ce07 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
@@ -46,12 +46,12 @@ namespace Foam
 Foam::WenYu::WenYu
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 :
-    dragModel(interfaceDict, alpha, phasea, phaseb)
+    dragModel(interfaceDict, alpha1, phase1, phase2)
 {}
 
 
@@ -68,16 +68,16 @@ Foam::tmp<Foam::volScalarField> Foam::WenYu::K
     const volScalarField& Ur
 ) const
 {
-    volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
+    volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
 
-    volScalarField Re(max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
+    volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
     volScalarField Cds
     (
         neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
       + pos(Re - 1000)*0.44
     );
 
-    return 0.75*Cds*phaseb_.rho()*Ur*pow(beta, -2.65)/phasea_.d();
+    return 0.75*Cds*phase2_.rho()*Ur*pow(alpha2, -2.65)/phase1_.d();
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
index 91ee92f03dc3383b00e0e4fe73742f0fb5b85810..dccf604f4fed14f98508ecd6f303ee3171789ec0 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
@@ -76,9 +76,9 @@ public:
         WenYu
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
index a2a31a0885a82349031f1bf34002421b161e8a6f..a305eacda8a55c0764efbee3577245241b1f406b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
@@ -39,15 +39,15 @@ namespace Foam
 Foam::dragModel::dragModel
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 :
     interfaceDict_(interfaceDict),
-    alpha_(alpha),
-    phasea_(phasea),
-    phaseb_(phaseb)
+    alpha1_(alpha1),
+    phase1_(phase1),
+    phase2_(phase2)
 {}
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index 0831f158b62caf9719adce81a03cb2562ffc9e04..caba2f787eb88bb47e83588c4f824929c39ae634 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -55,9 +55,9 @@ protected:
     // Protected data
 
         const dictionary& interfaceDict_;
-        const volScalarField& alpha_;
-        const phaseModel& phasea_;
-        const phaseModel& phaseb_;
+        const volScalarField& alpha1_;
+        const phaseModel& phase1_;
+        const phaseModel& phase2_;
 
 
 public:
@@ -75,11 +75,11 @@ public:
             dictionary,
             (
                 const dictionary& interfaceDict,
-                const volScalarField& alpha,
-                const phaseModel& phasea,
-                const phaseModel& phaseb
+                const volScalarField& alpha1,
+                const phaseModel& phase1,
+                const phaseModel& phase2
             ),
-            (interfaceDict, alpha, phasea, phaseb)
+            (interfaceDict, alpha1, phase1, phase2)
         );
 
 
@@ -88,9 +88,9 @@ public:
         dragModel
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
@@ -103,21 +103,22 @@ public:
         static autoPtr<dragModel> New
         (
             const dictionary& interfaceDict,
-            const volScalarField& alpha,
-            const phaseModel& phasea,
-            const phaseModel& phaseb
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
         );
 
 
     // Member Functions
 
         //- the dragfunction K used in the momentum eq.
-        //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
-        //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
+        //    ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(U1-U2)
+        //    ddt(alpha2*rho2*U2) + ...  = ... alpha1*alpha2*K*(U2-U1)
         // ********************************** NB ! *****************************
-        // for numerical reasons alpha and beta has been
+        // for numerical reasons alpha1 and alpha2 has been
         // extracted from the dragFunction K,
-        // so you MUST divide K by alpha*beta when implemnting the drag function
+        // so you MUST divide K by alpha1*alpha2 when implemnting the drag
+        // function
         // ********************************** NB ! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index 1a7ee04f4248a43942df923c01bdc3fe6122f6d5..91fdf8e1abfe521f0a4775ebe0c67a5a34430699 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -30,18 +30,18 @@ License
 Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
 (
     const dictionary& interfaceDict,
-    const volScalarField& alpha,
-    const phaseModel& phasea,
-    const phaseModel& phaseb
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
 )
 {
     word dragModelType
     (
-        interfaceDict.lookup("dragModel" + phasea.name())
+        interfaceDict.lookup("dragModel" + phase1.name())
     );
 
     Info << "Selecting dragModel for phase "
-        << phasea.name()
+        << phase1.name()
         << ": "
         << dragModelType << endl;
 
@@ -60,7 +60,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
              << abort(FatalError);
     }
 
-    return cstrIter()(interfaceDict, alpha, phasea, phaseb);
+    return cstrIter()(interfaceDict, alpha1, phase1, phase2);
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
index eeab2a4203e906e0960f37fc866a6222cb8b9f78..50580d738bc9b189f4940085c209e1e59195ae87 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
@@ -60,21 +60,21 @@ Foam::GidaspowConductivity::~GidaspowConductivity()
 
 Foam::tmp<Foam::volScalarField> Foam::GidaspowConductivity::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*g0*0.5*(1.0 + e)*sqr(alpha)
-      + (15.0/16.0)*sqrtPi*alpha
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*g0*0.5*(1.0 + e)*sqr(alpha1)
+      + (15.0/16.0)*sqrtPi*alpha1
       + (25.0/64.0)*sqrtPi/((1.0 + e)*g0)
     );
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
index 50a525bcdef1a485581107078f5832f5fe706b72..7e6eb96612bd28af449340719183b7acc75338d3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
@@ -70,10 +70,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index 728a7ab03babb3c3481e257407c5810bec47d8df..0c4e4b3da10c4bd814b7185d7b9d51da106260d5 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -65,10 +65,10 @@ Foam::HrenyaSinclairConductivity::~HrenyaSinclairConductivity()
 
 Foam::tmp<Foam::volScalarField> Foam::HrenyaSinclairConductivity::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& da,
     const dimensionedScalar& e
 ) const
@@ -77,15 +77,15 @@ Foam::tmp<Foam::volScalarField> Foam::HrenyaSinclairConductivity::kappa
 
     volScalarField lamda
     (
-        scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_
+        scalar(1) + da/(6.0*sqrt(2.0)*(alpha1 + scalar(1.0e-5)))/L_
     );
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha)
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha1)
        /(49.0/16.0 - 33.0*e/16.0)
-      + (15.0/16.0)*sqrtPi*alpha*(0.5*sqr(e) + 0.25*e - 0.75 + lamda)
+      + (15.0/16.0)*sqrtPi*alpha1*(0.5*sqr(e) + 0.25*e - 0.75 + lamda)
        /((49.0/16.0 - 33.0*e/16.0)*lamda)
       + (25.0/64.0)*sqrtPi
        /((1.0 + e)*(49.0/16.0 - 33.0*e/16.0)*lamda*g0)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
index 73809e4352578e0ac45c13f15e16b827efae342d..7da2a877e042b815578ce129aba8a7779d717daf 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
@@ -75,10 +75,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
index 168977a966956811d3639d34d27cbf3dc6c9e9e0..b97c884223b55e69b8ab3589023b73788dfbfee2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
@@ -60,22 +60,22 @@ Foam::SyamlalConductivity::~SyamlalConductivity()
 
 Foam::tmp<Foam::volScalarField> Foam::SyamlalConductivity::kappa
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (9.0/8.0)*sqrtPi*g0*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha)
+        2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (9.0/8.0)*sqrtPi*g0*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha1)
        /(49.0/16.0 - 33.0*e/16.0)
-      + (15.0/32.0)*sqrtPi*alpha/(49.0/16.0 - 33.0*e/16.0)
+      + (15.0/32.0)*sqrtPi*alpha1/(49.0/16.0 - 33.0*e/16.0)
     );
 }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
index d9cac153c1671bbba521544843c738cf524ec456..84e6d232c52f463aaefb76f151b7d0324d524ec2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
@@ -70,10 +70,10 @@ public:
 
         tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 626ee128f187f7e2ff42364c333bb85f613af872..c1f964a094201ed4b0a48d77de7d4d031884b02c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -104,10 +104,10 @@ public:
 
         virtual tmp<volScalarField> kappa
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const = 0;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index c5f3aa7bbcb01ce15df853b480081a064c72ddbd..fe1b99617f1a8305a8b2068d8a41f31e26319a48 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -63,9 +63,9 @@ Foam::JohnsonJacksonFrictionalStress::~JohnsonJacksonFrictionalStress()
 Foam::tmp<Foam::volScalarField> Foam::JohnsonJacksonFrictionalStress::
 frictionalPressure
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -73,17 +73,17 @@ frictionalPressure
 {
 
     return
-        Fr*pow(max(alpha - alphaMinFriction, scalar(0)), eta)
-       /pow(max(alphaMax - alpha, scalar(5.0e-2)), p);
+        Fr*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta)
+       /pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p);
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::JohnsonJacksonFrictionalStress::
 frictionalPressurePrime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -91,16 +91,17 @@ frictionalPressurePrime
 {
     return Fr*
     (
-        eta*pow(max(alpha - alphaMinFriction, scalar(0)), eta - 1.0)
-       *(alphaMax-alpha) + p*pow(max(alpha - alphaMinFriction, scalar(0)), eta)
-    )/pow(max(alphaMax - alpha, scalar(5.0e-2)), p + 1.0);
+        eta*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta - 1.0)
+       *(alpha1Max-alpha1)
+      + p*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta)
+    )/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p + 1.0);
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::JohnsonJacksonFrictionalStress::muf
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max,
     const volScalarField& pf,
     const volSymmTensorField& D,
     const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
index d04df308832d47e37ff15641157d5ede720b2ffd..4b9a6a6a710f5a2e1433bbef06b34fee9c0497f8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
@@ -70,9 +70,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -80,9 +80,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -90,8 +90,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index becf3540f633c1fc492f5f0ec0fbe93da26c9be0..96fad1a2ad828a01300654bc2f2113f442661c93 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -63,9 +63,9 @@ Foam::SchaefferFrictionalStress::~SchaefferFrictionalStress()
 Foam::tmp<Foam::volScalarField> Foam::SchaefferFrictionalStress::
 frictionalPressure
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -73,16 +73,16 @@ frictionalPressure
 {
     return
         dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24)
-       *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 10.0);
+       *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 10.0);
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::SchaefferFrictionalStress::
 frictionalPressurePrime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMinFriction,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1MinFriction,
+    const dimensionedScalar& alpha1Max,
     const dimensionedScalar& Fr,
     const dimensionedScalar& eta,
     const dimensionedScalar& p
@@ -90,14 +90,14 @@ frictionalPressurePrime
 {
     return
         dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25)
-       *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 9.0);
+       *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 9.0);
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::SchaefferFrictionalStress::muf
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax,
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max,
     const volScalarField& pf,
     const volSymmTensorField& D,
     const dimensionedScalar& phi
@@ -114,10 +114,10 @@ Foam::tmp<Foam::volScalarField> Foam::SchaefferFrictionalStress::muf
             IOobject
             (
                 "muf",
-                alpha.mesh().time().timeName(),
-                alpha.mesh()
+                alpha1.mesh().time().timeName(),
+                alpha1.mesh()
             ),
-            alpha.mesh(),
+            alpha1.mesh(),
             dimensionedScalar("muf", dimensionSet(1, -1, -1, 0, 0), 0.0)
         )
     );
@@ -126,7 +126,7 @@ Foam::tmp<Foam::volScalarField> Foam::SchaefferFrictionalStress::muf
 
     forAll (D, celli)
     {
-        if (alpha[celli] > alphaMax.value() - 5e-2)
+        if (alpha1[celli] > alpha1Max.value() - 5e-2)
         {
             muff[celli] =
                 0.5*pf[celli]*sin(phi.value())
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
index 461db24f56640d09b8411cc51dbe31cf0ff16d37..b7b1f3cb0f247f7cbd726874e38ea3b1b897e275 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
@@ -70,9 +70,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -80,9 +80,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& n,
             const dimensionedScalar& p
@@ -90,8 +90,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index fe84b62943d4da3c5d64b0775a564efa8b3aa567..4bf37cd32b3e9841ad9f5ed0c6c7a7441c16b763 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -104,9 +104,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressure
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -114,9 +114,9 @@ public:
 
         virtual tmp<volScalarField> frictionalPressurePrime
         (
-            const volScalarField& alphaf,
-            const dimensionedScalar& alphaMinFriction,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1f,
+            const dimensionedScalar& alpha1MinFriction,
+            const dimensionedScalar& alpha1Max,
             const dimensionedScalar& Fr,
             const dimensionedScalar& eta,
             const dimensionedScalar& p
@@ -124,8 +124,8 @@ public:
 
         virtual tmp<volScalarField> muf
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax,
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max,
             const volScalarField& pf,
             const volSymmTensorField& D,
             const dimensionedScalar& phi
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
index a20ced276aa7ccafb7403ea5a74cd85713d98401..8c58b17d158b217631f578b55e1f52ee8bc88eae 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
@@ -59,27 +59,27 @@ Foam::LunPressure::~LunPressure()
 
 Foam::tmp<Foam::volScalarField> Foam::LunPressure::granularPressureCoeff
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
 
-    return rhoa*alpha*(1.0 + 2.0*(1.0 + e)*alpha*g0);
+    return rho1*alpha1*(1.0 + 2.0*(1.0 + e)*alpha1*g0);
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::LunPressure::granularPressureCoeffPrime
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
     const volScalarField& g0prime,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
-    return rhoa*(1.0 + alpha*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha));
+    return rho1*(1.0 + alpha1*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha1));
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
index 23ee1ba3983c93fca0ed90aba0b636bee5bd620b..84550c7d8184b26f0116014139b63b71559cafb4 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
@@ -70,18 +70,18 @@ public:
 
         tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 
         tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 };
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
index 9fcd4b8bd79cff3a39405fd7bd05e83deac914de..39690a2e98546570562deff8dc5e17eb43fadd71 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
@@ -63,28 +63,28 @@ Foam::SyamlalRogersOBrienPressure::~SyamlalRogersOBrienPressure()
 Foam::tmp<Foam::volScalarField> Foam::SyamlalRogersOBrienPressure::
 granularPressureCoeff
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
 
-    return 2.0*rhoa*(1.0 + e)*sqr(alpha)*g0;
+    return 2.0*rho1*(1.0 + e)*sqr(alpha1)*g0;
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::SyamlalRogersOBrienPressure::
 granularPressureCoeffPrime
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& g0,
     const volScalarField& g0prime,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& e
 ) const
 {
-    return rhoa*alpha*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha);
+    return rho1*alpha1*(1.0 + e)*(4.0*g0 + 2.0*g0prime*alpha1);
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
index 006e4419dd64aa3e79496a80c00104f4a526273f..a1f99b8f94a169ec312a3800564f7ee1d8c45b4c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
@@ -70,18 +70,18 @@ public:
 
         tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 
         tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const;
 };
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 07e0da5559e260bed34e382649f0a0878997f7d6..c618bf4246bd0283b4679cf1f45fdcd7e1d1013d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -105,19 +105,19 @@ public:
         //- Granular pressure coefficient
         virtual tmp<volScalarField> granularPressureCoeff
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const = 0;
 
         //- Derivative of the granular pressure coefficient
         virtual tmp<volScalarField> granularPressureCoeffPrime
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& g0,
             const volScalarField& g0prime,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& e
         ) const = 0;
 };
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 34eb52ccc4b7733a062f0120c7789c059e48015a..9eccfb0a956eb867d9ec2bfc78ee032fb95df466 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -32,30 +32,30 @@ License
 
 Foam::kineticTheoryModel::kineticTheoryModel
 (
-    const Foam::phaseModel& phasea,
-    const Foam::volVectorField& Ub,
-    const Foam::volScalarField& alpha,
-    const Foam::dragModel& draga
+    const Foam::phaseModel& phase1,
+    const Foam::volVectorField& U2,
+    const Foam::volScalarField& alpha1,
+    const Foam::dragModel& drag1
 )
 :
-    phasea_(phasea),
-    Ua_(phasea.U()),
-    Ub_(Ub),
-    alpha_(alpha),
-    phia_(phasea.phi()),
-    draga_(draga),
+    phase1_(phase1),
+    U1_(phase1.U()),
+    U2_(U2),
+    alpha1_(alpha1),
+    phi1_(phase1.phi()),
+    drag1_(drag1),
 
-    rhoa_(phasea.rho()),
-    da_(phasea.d()),
-    nua_(phasea.nu()),
+    rho1_(phase1.rho()),
+    da_(phase1.d()),
+    nu1_(phase1.nu()),
 
     kineticTheoryProperties_
     (
         IOobject
         (
             "kineticTheoryProperties",
-            Ua_.time().constant(),
-            Ua_.mesh(),
+            U1_.time().constant(),
+            U1_.mesh(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )
@@ -99,8 +99,8 @@ Foam::kineticTheoryModel::kineticTheoryModel
         )
     ),
     e_(kineticTheoryProperties_.lookup("e")),
-    alphaMax_(kineticTheoryProperties_.lookup("alphaMax")),
-    alphaMinFriction_(kineticTheoryProperties_.lookup("alphaMinFriction")),
+    alpha1Max_(kineticTheoryProperties_.lookup("alpha1Max")),
+    alpha1MinFriction_(kineticTheoryProperties_.lookup("alpha1MinFriction")),
     Fr_(kineticTheoryProperties_.lookup("Fr")),
     eta_(kineticTheoryProperties_.lookup("eta")),
     p_(kineticTheoryProperties_.lookup("p")),
@@ -110,24 +110,24 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "Theta",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh()
+        U1_.mesh()
     ),
-    mua_
+    mu1_
     (
         IOobject
         (
-            "mua",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            "mu1",
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     lambda_
@@ -135,12 +135,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "lambda",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     pa_
@@ -148,12 +148,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "pa",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -2, 0, 0), 0.0)
     ),
     kappa_
@@ -161,12 +161,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "kappa",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     gs0_
@@ -174,12 +174,12 @@ Foam::kineticTheoryModel::kineticTheoryModel
         IOobject
         (
             "gs0",
-            Ua_.time().timeName(),
-            Ua_.mesh(),
+            U1_.time().timeName(),
+            U1_.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Ua_.mesh(),
+        U1_.mesh(),
         dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 1.0)
     )
 {}
@@ -193,7 +193,7 @@ Foam::kineticTheoryModel::~kineticTheoryModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
+void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t)
 {
     if (!kineticTheory_)
     {
@@ -202,24 +202,24 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
 
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    surfaceScalarField phi(1.5*rhoa_*phia_*fvc::interpolate(alpha_));
+    surfaceScalarField phi(1.5*rho1_*phi1_*fvc::interpolate(alpha1_));
 
-    volTensorField dU(gradUat.T());    //fvc::grad(Ua_);
+    volTensorField dU(gradU1t.T());    //fvc::grad(U1_);
     volSymmTensorField D(symm(dU));
 
-    // NB, drag = K*alpha*beta,
-    // (the alpha and beta has been extracted from the drag function for
+    // NB, drag = K*alpha1*alpha2,
+    // (the alpha1 and alpha2 has been extracted from the drag function for
     // numerical reasons)
-    volScalarField Ur(mag(Ua_ - Ub_));
-    volScalarField betaPrim(alpha_*(1.0 - alpha_)*draga_.K(Ur));
+    volScalarField Ur(mag(U1_ - U2_));
+    volScalarField alpha2Prim(alpha1_*(1.0 - alpha1_)*drag1_.K(Ur));
 
     // Calculating the radial distribution function (solid volume fraction is
     //  limited close to the packing limit, but this needs improvements)
     //  The solution is higly unstable close to the packing limit.
     gs0_ = radialModel_->g0
     (
-        min(max(alpha_, scalar(1e-6)), alphaMax_ - 0.01),
-        alphaMax_
+        min(max(alpha1_, scalar(1e-6)), alpha1Max_ - 0.01),
+        alpha1Max_
     );
 
     // particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45)
@@ -227,18 +227,18 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         granularPressureModel_->granularPressureCoeff
         (
-            alpha_,
+            alpha1_,
             gs0_,
-            rhoa_,
+            rho1_,
             e_
         )
     );
 
     // 'thermal' conductivity (Table 3.3, p. 49)
-    kappa_ = conductivityModel_->kappa(alpha_, Theta_, gs0_, rhoa_, da_, e_);
+    kappa_ = conductivityModel_->kappa(alpha1_, Theta_, gs0_, rho1_, da_, e_);
 
     // particle viscosity (Table 3.2, p.47)
-    mua_ = viscosityModel_->mua(alpha_, Theta_, gs0_, rhoa_, da_, e_);
+    mu1_ = viscosityModel_->mu1(alpha1_, Theta_, gs0_, rho1_, da_, e_);
 
     dimensionedScalar Tsmall
     (
@@ -253,22 +253,22 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     // dissipation (Eq. 3.24, p.50)
     volScalarField gammaCoeff
     (
-        12.0*(1.0 - sqr(e_))*sqr(alpha_)*rhoa_*gs0_*(1.0/da_)*ThetaSqrt/sqrtPi
+        12.0*(1.0 - sqr(e_))*sqr(alpha1_)*rho1_*gs0_*(1.0/da_)*ThetaSqrt/sqrtPi
     );
 
     // Eq. 3.25, p. 50 Js = J1 - J2
-    volScalarField J1(3.0*betaPrim);
+    volScalarField J1(3.0*alpha2Prim);
     volScalarField J2
     (
-        0.25*sqr(betaPrim)*da_*sqr(Ur)
-       /(max(alpha_, scalar(1e-6))*rhoa_*sqrtPi*(ThetaSqrt + TsmallSqrt))
+        0.25*sqr(alpha2Prim)*da_*sqr(Ur)
+       /(max(alpha1_, scalar(1e-6))*rho1_*sqrtPi*(ThetaSqrt + TsmallSqrt))
     );
 
     // bulk viscosity  p. 45 (Lun et al. 1984).
-    lambda_ = (4.0/3.0)*sqr(alpha_)*rhoa_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
+    lambda_ = (4.0/3.0)*sqr(alpha1_)*rho1_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
 
     // stress tensor, Definitions, Table 3.1, p. 43
-    volSymmTensorField tau(2.0*mua_*D + (lambda_ - (2.0/3.0)*mua_)*tr(D)*I);
+    volSymmTensorField tau(2.0*mu1_*D + (lambda_ - (2.0/3.0)*mu1_)*tr(D)*I);
 
     if (!equilibrium_)
     {
@@ -278,7 +278,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
         // wrong sign infront of laplacian
         fvScalarMatrix ThetaEqn
         (
-            fvm::ddt(1.5*alpha_*rhoa_, Theta_)
+            fvm::ddt(1.5*alpha1_*rho1_, Theta_)
           + fvm::div(phi, Theta_, "div(phi,Theta)")
          ==
             fvm::SuSp(-((PsCoeff*I) && dU), Theta_)
@@ -296,40 +296,40 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     {
         // equilibrium => dissipation == production
         // Eq. 4.14, p.82
-        volScalarField K1(2.0*(1.0 + e_)*rhoa_*gs0_);
+        volScalarField K1(2.0*(1.0 + e_)*rho1_*gs0_);
         volScalarField K3
         (
-            0.5*da_*rhoa_*
+            0.5*da_*rho1_*
             (
                 (sqrtPi/(3.0*(3.0-e_)))
-               *(1.0 + 0.4*(1.0 + e_)*(3.0*e_ - 1.0)*alpha_*gs0_)
-               +1.6*alpha_*gs0_*(1.0 + e_)/sqrtPi
+               *(1.0 + 0.4*(1.0 + e_)*(3.0*e_ - 1.0)*alpha1_*gs0_)
+               +1.6*alpha1_*gs0_*(1.0 + e_)/sqrtPi
             )
         );
 
         volScalarField K2
         (
-            4.0*da_*rhoa_*(1.0 + e_)*alpha_*gs0_/(3.0*sqrtPi) - 2.0*K3/3.0
+            4.0*da_*rho1_*(1.0 + e_)*alpha1_*gs0_/(3.0*sqrtPi) - 2.0*K3/3.0
         );
 
-        volScalarField K4(12.0*(1.0 - sqr(e_))*rhoa_*gs0_/(da_*sqrtPi));
+        volScalarField K4(12.0*(1.0 - sqr(e_))*rho1_*gs0_/(da_*sqrtPi));
 
         volScalarField trD(tr(D));
         volScalarField tr2D(sqr(trD));
         volScalarField trD2(tr(D & D));
 
-        volScalarField t1(K1*alpha_ + rhoa_);
+        volScalarField t1(K1*alpha1_ + rho1_);
         volScalarField l1(-t1*trD);
         volScalarField l2(sqr(t1)*tr2D);
         volScalarField l3
         (
             4.0
            *K4
-           *max(alpha_, scalar(1e-6))
+           *max(alpha1_, scalar(1e-6))
            *(2.0*K3*trD2 + K2*tr2D)
         );
 
-        Theta_ = sqr((l1 + sqrt(l2 + l3))/(2.0*(alpha_ + 1.0e-4)*K4));
+        Theta_ = sqr((l1 + sqrt(l2 + l3))/(2.0*(alpha1_ + 1.0e-4)*K4));
     }
 
     Theta_.max(1.0e-15);
@@ -339,9 +339,9 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         frictionalStressModel_->frictionalPressure
         (
-            alpha_,
-            alphaMinFriction_,
-            alphaMax_,
+            alpha1_,
+            alpha1MinFriction_,
+            alpha1Max_,
             Fr_,
             eta_,
             p_
@@ -361,8 +361,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     (
         frictionalStressModel_->muf
         (
-            alpha_,
-            alphaMax_,
+            alpha1_,
+            alpha1Max_,
             pf,
             D,
             phi_
@@ -370,16 +370,16 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     );
 
     // add frictional stress
-    mua_ += muf;
-    mua_.min(1.0e+2);
-    mua_.max(0.0);
+    mu1_ += muf;
+    mu1_.min(1.0e+2);
+    mu1_.max(0.0);
 
     Info<< "kinTheory: max(Theta) = " << max(Theta_).value() << endl;
 
-    volScalarField ktn(mua_/rhoa_);
+    volScalarField ktn(mu1_/rho1_);
 
-    Info<< "kinTheory: min(nua) = " << min(ktn).value()
-        << ", max(nua) = " << max(ktn).value() << endl;
+    Info<< "kinTheory: min(nu1) = " << min(ktn).value()
+        << ", max(nu1) = " << max(ktn).value() << endl;
 
     Info<< "kinTheory: min(pa) = " << min(pa_).value()
         << ", max(pa) = " << max(pa_).value() << endl;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 9d5bdd7433c313ddab1bcba2d2641c09b2c4c86b..75fe09128e5dec90e5ad76548128942113e511fe 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -56,17 +56,17 @@ class kineticTheoryModel
 {
     // Private data
 
-        const phaseModel& phasea_;
-        const volVectorField& Ua_;
-        const volVectorField& Ub_;
-        const volScalarField& alpha_;
-        const surfaceScalarField& phia_;
+        const phaseModel& phase1_;
+        const volVectorField& U1_;
+        const volVectorField& U2_;
+        const volScalarField& alpha1_;
+        const surfaceScalarField& phi1_;
 
-        const dragModel& draga_;
+        const dragModel& drag1_;
 
-        const dimensionedScalar& rhoa_;
+        const dimensionedScalar& rho1_;
         const dimensionedScalar& da_;
-        const dimensionedScalar& nua_;
+        const dimensionedScalar& nu1_;
 
         //- dictionary holding the modeling info
         IOdictionary kineticTheoryProperties_;
@@ -91,10 +91,10 @@ class kineticTheoryModel
         const dimensionedScalar e_;
 
         //- maximum packing
-        const dimensionedScalar alphaMax_;
+        const dimensionedScalar alpha1Max_;
 
         //- min value for which the frictional stresses are zero
-        const dimensionedScalar alphaMinFriction_;
+        const dimensionedScalar alpha1MinFriction_;
 
         //- material constant for frictional normal stress
         const dimensionedScalar Fr_;
@@ -112,7 +112,7 @@ class kineticTheoryModel
         volScalarField Theta_;
 
         //- The granular viscosity
-        volScalarField mua_;
+        volScalarField mu1_;
 
         //- The granular bulk viscosity
         volScalarField lambda_;
@@ -143,10 +143,10 @@ public:
         //- Construct from components
         kineticTheoryModel
         (
-            const phaseModel& phasea,
-            const volVectorField& Ub,
-            const volScalarField& alpha,
-            const dragModel& draga
+            const phaseModel& phase1,
+            const volVectorField& U2,
+            const volScalarField& alpha1,
+            const dragModel& drag1
         );
 
 
@@ -156,16 +156,16 @@ public:
 
     // Member Functions
 
-        void solve(const volTensorField& gradUat);
+        void solve(const volTensorField& gradU1t);
 
         bool on() const
         {
             return kineticTheory_;
         }
 
-        const volScalarField& mua() const
+        const volScalarField& mu1() const
         {
-            return mua_;
+            return mu1_;
         }
 
         const volScalarField& pa() const
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index e371b9f7deca5ccb1cef1da35c02ca122eaceb9d..a28dc84e72360d0d531a86347a47ee6519707019 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -59,29 +59,29 @@ Foam::CarnahanStarlingRadial::~CarnahanStarlingRadial()
 
 Foam::tmp<Foam::volScalarField> Foam::CarnahanStarlingRadial::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
 
     return
-        1.0/(1.0 - alpha)
-      + 3.0*alpha/(2.0*sqr(1.0 - alpha))
-      + sqr(alpha)/(2.0*pow(1.0 - alpha, 3));
+        1.0/(1.0 - alpha1)
+      + 3.0*alpha1/(2.0*sqr(1.0 - alpha1))
+      + sqr(alpha1)/(2.0*pow(1.0 - alpha1, 3));
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::CarnahanStarlingRadial::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        - alpha/sqr(1.0 - alpha)
-        + (3.0*(1.0 - alpha) + 6.0*sqr(alpha))/(2.0*(1.0 - alpha))
-        + (2.0*alpha*(1.0 - alpha) + 3.0*pow(alpha, 3))
-         /(2.0*pow(1.0 - alpha, 4));
+        - alpha1/sqr(1.0 - alpha1)
+        + (3.0*(1.0 - alpha1) + 6.0*sqr(alpha1))/(2.0*(1.0 - alpha1))
+        + (2.0*alpha1*(1.0 - alpha1) + 3.0*pow(alpha1, 3))
+         /(2.0*pow(1.0 - alpha1, 4));
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
index 3ff3f86dd8f74159ab80a818622b107db19ff035..00ae96de23750cb9ce2c62c8a8cbfd6d0f935a61 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
@@ -71,14 +71,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
index f1e67f61e9ee26b0c1bf89ffdb15c51b62a1d4c7..e5b932fa00974c3059d2291fe0b85e61b9aef593 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
@@ -59,23 +59,23 @@ Foam::GidaspowRadial::~GidaspowRadial()
 
 Foam::tmp<Foam::volScalarField> Foam::GidaspowRadial::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 0.6/(1.0 - pow(alpha/alphaMax, 1.0/3.0));
+    return 0.6/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0));
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::GidaspowRadial::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        (-1.0/5.0)*pow(alpha/alphaMax, -2.0/3.0)
-       /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
+        (-1.0/5.0)*pow(alpha1/alpha1Max, -2.0/3.0)
+       /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)));
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
index 25742dcd5f5395dae12364216df33aa88bfd265e..5b329ce67b5837a38bcca8be184f1b6430c14057 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
@@ -70,14 +70,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index eebd853eddf35c18a1513508b6bf710b47575a2f..3659ed66a3428f43e01d2e2c804ddd65d79c386a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -59,22 +59,22 @@ Foam::LunSavageRadial::~LunSavageRadial()
 
 Foam::tmp<Foam::volScalarField> Foam::LunSavageRadial::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
 
-    return pow(1.0 - alpha/alphaMax, -2.5*alphaMax);
+    return pow(1.0 - alpha1/alpha1Max, -2.5*alpha1Max);
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::LunSavageRadial::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 2.5*alphaMax*alpha*pow(1.0 - alpha, -1.0 - 2.5*alphaMax);
+    return 2.5*alpha1Max*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alpha1Max);
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
index a2d1a1542a18d61e7c7da2b8eae4c76b3590d96a..57dcd2b20bfff1e41dbacf74fbc98933285fa352 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
@@ -70,14 +70,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index 41d8d29a614105d7464b90b4a3a760281517fc45..31ccb15dfcd314799491c668f9a10dd0c07d8055 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -59,23 +59,23 @@ Foam::SinclairJacksonRadial::~SinclairJacksonRadial()
 
 Foam::tmp<Foam::volScalarField> Foam::SinclairJacksonRadial::g0
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
-    return 1.0/(1.0 - pow(alpha/alphaMax, 1.0/3.0));
+    return 1.0/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0));
 }
 
 
 Foam::tmp<Foam::volScalarField> Foam::SinclairJacksonRadial::g0prime
 (
-    const volScalarField& alpha,
-    const dimensionedScalar& alphaMax
+    const volScalarField& alpha1,
+    const dimensionedScalar& alpha1Max
 ) const
 {
     return
-        (-1.0/3.0)*pow(alpha/alphaMax, -2.0/3.0)
-       /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
+        (-1.0/3.0)*pow(alpha1/alpha1Max, -2.0/3.0)
+       /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)));
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
index 5c580bc8ef7067b4be8b52ff0c6b7f9d3137fe3f..df143b9083891d474bc59e5ccd5123068288a167 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
@@ -70,14 +70,14 @@ public:
 
         tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 
         tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
index af0665133357e45c2c01329193f6bdfaa6262f1f..57b8e1e581732e5f456236abd44a92a347a9ead0 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -105,15 +105,15 @@ public:
         //- Radial distribution function
         virtual tmp<volScalarField> g0
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const = 0;
 
         //- Derivative of the radial distribution function
         virtual tmp<volScalarField> g0prime
         (
-            const volScalarField& alpha,
-            const dimensionedScalar& alphaMax
+            const volScalarField& alpha1,
+            const dimensionedScalar& alpha1Max
         ) const = 0;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index a287da760dbd084b4287c27eeb7daff27fc3d95c..7016b2fb892d9e84dc8fc088f8f93ad0f80a1435 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -59,23 +59,23 @@ Foam::kineticTheoryModels::GidaspowViscosity::~GidaspowViscosity()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::kineticTheoryModels::GidaspowViscosity::mua
+Foam::kineticTheoryModels::GidaspowViscosity::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*sqr(alpha)
-      + (1.0/6.0)*sqrtPi*alpha
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*sqr(alpha1)
+      + (1.0/6.0)*sqrtPi*alpha1
       + (10.0/96.0)*sqrtPi/((1.0 + e)*g0)
     );
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
index be02d81afed25c11b04d0c97d0981bd88cf15145..398a04fb0a831fbf538b8c840613a4e7625139f3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
@@ -69,12 +69,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index 4646bac78a5aa9968b5bbd867048a07504b9d754..33395bd3bb6bdc686328f381d0d3519f259aea82 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -66,12 +66,12 @@ Foam::kineticTheoryModels::HrenyaSinclairViscosity::~HrenyaSinclairViscosity()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::kineticTheoryModels::HrenyaSinclairViscosity::mua
+Foam::kineticTheoryModels::HrenyaSinclairViscosity::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& da,
     const dimensionedScalar& e
 ) const
@@ -80,14 +80,14 @@ Foam::kineticTheoryModels::HrenyaSinclairViscosity::mua
 
     volScalarField lamda
     (
-        scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_
+        scalar(1) + da/(6.0*sqrt(2.0)*(alpha1 + scalar(1.0e-5)))/L_
     );
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1)*sqr(alpha)/(3.0-e)
-      + (1.0/6.0)*sqrtPi*alpha*(0.5*lamda + 0.25*(3.0*e - 1.0))
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1)*sqr(alpha1)/(3.0-e)
+      + (1.0/6.0)*sqrtPi*alpha1*(0.5*lamda + 0.25*(3.0*e - 1.0))
        /(0.5*(3.0 - e)*lamda)
       + (10/96.0)*sqrtPi/((1.0 + e)*0.5*(3.0 - e)*g0*lamda)
     );
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
index a736081869d46c4c41d4e0996b50df10c3ef550d..f77e6887f266a929c59930f6122e8e2bd330f876 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
@@ -77,12 +77,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index 8441184b1909b3e8c67dca93d53df7ec9707c1cd..11d538f50b4e1ad0ba703fd78057ae0cf1fd6ae2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -58,23 +58,23 @@ Foam::kineticTheoryModels::SyamlalViscosity::~SyamlalViscosity()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::SyamlalViscosity::mua
+Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::SyamlalViscosity::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& da,
     const dimensionedScalar& e
 ) const
 {
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
 
-    return rhoa*da*sqrt(Theta)*
+    return rho1*da*sqrt(Theta)*
     (
-        (4.0/5.0)*sqr(alpha)*g0*(1.0 + e)/sqrtPi
-      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1.0)*sqr(alpha)/(3.0 - e)
-      + (1.0/6.0)*alpha*sqrtPi/(3.0 - e)
+        (4.0/5.0)*sqr(alpha1)*g0*(1.0 + e)/sqrtPi
+      + (1.0/15.0)*sqrtPi*g0*(1.0 + e)*(3.0*e - 1.0)*sqr(alpha1)/(3.0 - e)
+      + (1.0/6.0)*alpha1*sqrtPi/(3.0 - e)
     );
 }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
index db2c63d6105cb9e8787b45ba5e6d6ec306bae2a9..50629e8a856fb1eab4e57b9f42d4a4ec5b58a5ec 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
@@ -70,12 +70,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index d9c9c9d8ce4436aa6f8d3b0788c59a49d67aac4b..4389995f91e49eeb2e5747aeb5699a9001a2d557 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -53,12 +53,12 @@ Foam::kineticTheoryModels::noneViscosity::~noneViscosity()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mua
+Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mu1
 (
-    const volScalarField& alpha,
+    const volScalarField& alpha1,
     const volScalarField& Theta,
     const volScalarField& g0,
-    const dimensionedScalar& rhoa,
+    const dimensionedScalar& rho1,
     const dimensionedScalar& da,
     const dimensionedScalar& e
 ) const
@@ -68,7 +68,7 @@ Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mua
         "0",
         dimensionSet(1, -1, -1, 0, 0, 0, 0),
         0.0
-    )*alpha;
+    )*alpha1;
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
index c131f4bb8117b7fc9aa242f748585127033f91a9..12426d0a3772a514d21e49cbbca10d1d3c37da24 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
@@ -70,12 +70,12 @@ public:
 
     // Member functions
 
-        tmp<volScalarField> mua
+        tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index bbd06df77233e5492166af143c7d96f99c5cd7d5..995dec12195ca8451aae5d3d8e102e50ed04fc72 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -106,12 +106,12 @@ public:
 
     // Member Functions
 
-        virtual tmp<volScalarField> mua
+        virtual tmp<volScalarField> mu1
         (
-            const volScalarField& alpha,
+            const volScalarField& alpha1,
             const volScalarField& Theta,
             const volScalarField& g0,
-            const dimensionedScalar& rhoa,
+            const dimensionedScalar& rho1,
             const dimensionedScalar& da,
             const dimensionedScalar& e
         ) const = 0;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/liftDragCoeffs.H b/applications/solvers/multiphase/twoPhaseEulerFoam/liftDragCoeffs.H
index 27519eaf2e113740051f323da76c95d199e6e783..097123378cdd09bebcd790a62d055a2a4c3d8834 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/liftDragCoeffs.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/liftDragCoeffs.H
@@ -1,18 +1,21 @@
-    volVectorField Ur(Ua - Ub);
+    volVectorField Ur(U1 - U2);
     volScalarField magUr(mag(Ur) + residualSlip);
 
-    volScalarField Ka(draga->K(magUr));
+    volScalarField Ka(drag1->K(magUr));
     volScalarField K(Ka);
 
-    if (dragPhase == "b")
+    if (dragPhase == "2")
     {
-        volScalarField Kb(dragb->K(magUr));
+        volScalarField Kb(drag2->K(magUr));
         K = Kb;
     }
     else if (dragPhase == "blended")
     {
-        volScalarField Kb(dragb->K(magUr));
-        K = (beta*Ka + alpha*Kb);
+        volScalarField Kb(drag2->K(magUr));
+        K = (alpha2*Ka + alpha1*Kb);
     }
 
-    volVectorField liftCoeff(Cl*(beta*rhob + alpha*rhoa)*(Ur ^ fvc::curl(U)));
+    volVectorField liftCoeff
+    (
+        Cl*(alpha2*rho2 + alpha1*rho1)*(Ur ^ fvc::curl(U))
+    );
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index 78e5587a3aff08406be14eabf57fb23225f4f83e..91f8302d7ff1a3c27bf971068c89815a8a94db7e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -1,37 +1,37 @@
 {
-    surfaceScalarField alphaf(fvc::interpolate(alpha));
-    surfaceScalarField betaf(scalar(1) - alphaf);
+    surfaceScalarField alpha1f(fvc::interpolate(alpha1));
+    surfaceScalarField alpha2f(scalar(1) - alpha1f);
 
-    volScalarField rUaA(1.0/UaEqn.A());
-    volScalarField rUbA(1.0/UbEqn.A());
+    volScalarField rAU1(1.0/U1Eqn.A());
+    volScalarField rAU2(1.0/U2Eqn.A());
 
-    rUaAf = fvc::interpolate(rUaA);
-    surfaceScalarField rUbAf(fvc::interpolate(rUbA));
+    rAU1f = fvc::interpolate(rAU1);
+    surfaceScalarField rAU2f(fvc::interpolate(rAU2));
 
-    volVectorField HbyAa("HbyAa", Ua);
-    HbyAa = rUaA*UaEqn.H();
+    volVectorField HbyA1("HbyA1", U1);
+    HbyA1 = rAU1*U1Eqn.H();
 
-    volVectorField HbyAb("HbyAb", Ub);
-    HbyAb = rUbA*UbEqn.H();
+    volVectorField HbyA2("HbyA2", U2);
+    HbyA2 = rAU2*U2Eqn.H();
 
-    surfaceScalarField phiDraga
+    surfaceScalarField phiDrag1
     (
-        fvc::interpolate(beta/rhoa*K*rUaA)*phib + rUaAf*(g & mesh.Sf())
+        fvc::interpolate(alpha2/rho1*K*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
     );
 
     if (g0.value() > 0.0)
     {
-        phiDraga -= ppMagf*fvc::snGrad(alpha)*mesh.magSf();
+        phiDrag1 -= ppMagf*fvc::snGrad(alpha1)*mesh.magSf();
     }
 
     if (kineticTheory.on())
     {
-        phiDraga -= rUaAf*fvc::snGrad(kineticTheory.pa()/rhoa)*mesh.magSf();
+        phiDrag1 -= rAU1f*fvc::snGrad(kineticTheory.pa()/rho1)*mesh.magSf();
     }
 
-    surfaceScalarField phiDragb
+    surfaceScalarField phiDrag2
     (
-        fvc::interpolate(alpha/rhob*K*rUbA)*phia + rUbAf*(g & mesh.Sf())
+        fvc::interpolate(alpha1/rho2*K*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
     );
 
     // Fix for gravity on outlet boundary.
@@ -39,33 +39,33 @@
     {
         if (isA<zeroGradientFvPatchScalarField>(p.boundaryField()[patchi]))
         {
-            phiDraga.boundaryField()[patchi] = 0.0;
-            phiDragb.boundaryField()[patchi] = 0.0;
+            phiDrag1.boundaryField()[patchi] = 0.0;
+            phiDrag2.boundaryField()[patchi] = 0.0;
         }
     }
 
-    surfaceScalarField phiHbyAa
+    surfaceScalarField phiHbyA1
     (
-        "phiHbyAa",
-        (fvc::interpolate(HbyAa) & mesh.Sf())
-      + fvc::ddtPhiCorr(rUaA, Ua, phia)
-      + phiDraga
+        "phiHbyA1",
+        (fvc::interpolate(HbyA1) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU1, U1, phi1)
+      + phiDrag1
     );
 
-    surfaceScalarField phiHbyAb
+    surfaceScalarField phiHbyA2
     (
-        "phiHbyAb",
-        (fvc::interpolate(HbyAb) & mesh.Sf())
-      + fvc::ddtPhiCorr(rUbA, Ub, phib)
-      + phiDragb
+        "phiHbyA2",
+        (fvc::interpolate(HbyA2) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU2, U2, phi2)
+      + phiDrag2
     );
 
-    surfaceScalarField phiHbyA("phiHbyA", alphaf*phiHbyAa + betaf*phiHbyAb);
+    surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
     surfaceScalarField Dp
     (
         "Dp",
-        alphaf*rUaAf/rhoa + betaf*rUbAf/rhob
+        alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
     );
 
     while (pimple.correctNonOrthogonal())
@@ -83,26 +83,26 @@
         {
             surfaceScalarField SfGradp(pEqn.flux()/Dp);
 
-            phia.boundaryField() ==
-                (fvc::interpolate(Ua) & mesh.Sf())().boundaryField();
-            phia = phiHbyAa - rUaAf*SfGradp/rhoa;
+            phi1.boundaryField() ==
+                (fvc::interpolate(U1) & mesh.Sf())().boundaryField();
+            phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
 
-            phib.boundaryField() ==
-                (fvc::interpolate(Ub) & mesh.Sf())().boundaryField();
-            phib = phiHbyAb - rUbAf*SfGradp/rhob;
+            phi2.boundaryField() ==
+                (fvc::interpolate(U2) & mesh.Sf())().boundaryField();
+            phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
 
-            phi = alphaf*phia + betaf*phib;
+            phi = alpha1f*phi1 + alpha2f*phi2;
 
             p.relax();
             SfGradp = pEqn.flux()/Dp;
 
-            Ua = HbyAa + fvc::reconstruct(phiDraga - rUaAf*SfGradp/rhoa);
-            Ua.correctBoundaryConditions();
+            U1 = HbyA1 + fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1);
+            U1.correctBoundaryConditions();
 
-            Ub = HbyAb + fvc::reconstruct(phiDragb - rUbAf*SfGradp/rhob);
-            Ub.correctBoundaryConditions();
+            U2 = HbyA2 + fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2);
+            U2.correctBoundaryConditions();
 
-            U = alpha*Ua + beta*Ub;
+            U = alpha1*U1 + alpha2*U2;
         }
     }
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H b/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H
index e5d9d86a559f4faba98dfe26d0aca8f25b07cc6f..1648384bac335cca438ca48f2dc393824723f92e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H
@@ -1,13 +1,13 @@
     if (packingLimiter)
     {
         // Calculating exceeding volume fractions
-        volScalarField alphaEx(max(alpha - alphaMax, scalar(0)));
+        volScalarField alpha1Ex(max(alpha1 - alpha1Max, scalar(0)));
 
         // Finding neighbouring cells of the whole domain
         labelListList neighbour = mesh.cellCells();
         scalarField cellVolumes(mesh.cellVolumes());
 
-        forAll (alphaEx, celli)
+        forAll (alpha1Ex, celli)
         {
             // Finding the labels of the neighbouring cells
             labelList neighbourCell = neighbour[celli];
@@ -27,10 +27,10 @@
                 }
 
                 neighboursEx +=
-                    alphaEx[neighbourCell[cellj]]*cellVolumes[celli]
+                    alpha1Ex[neighbourCell[cellj]]*cellVolumes[celli]
                    /neighboursNeighbourCellVolumes;
             }
 
-            alpha[celli] += neighboursEx - alphaEx[celli];
+            alpha1[celli] += neighboursEx - alpha1Ex[celli];
         }
     }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H b/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H
index a655736c547dba34301da4bf6dae5de97b534511..4cd123bd8e879cfa65582d78a2f06a7f5d9acbb3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H
@@ -12,7 +12,7 @@
 
     scalar preAlphaExp(readScalar(ppProperties.lookup("preAlphaExp")));
 
-    scalar alphaMax(readScalar(ppProperties.lookup("alphaMax")));
+    scalar alpha1Max(readScalar(ppProperties.lookup("alpha1Max")));
 
     scalar expMax(readScalar(ppProperties.lookup("expMax")));
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/write.H b/applications/solvers/multiphase/twoPhaseEulerFoam/write.H
index fccfaae107fd88962a14ab1efd9acb251cf49779..303661beb6492a7e608f6d5e2385c824bf8dc55f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/write.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/write.H
@@ -10,7 +10,7 @@
                 IOobject::NO_READ,
                 IOobject::AUTO_WRITE
             ),
-            Ua - Ub
+            U1 - U2
         );
 
         runTime.write();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
index 2465c726968f48d6a27ab19039edce6012d8cc53..8a9136b68a55c5eb00db3a8600aebb3244bdaaf8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
@@ -555,9 +555,13 @@ Foam::List<Foam::tetIndices> Foam::polyMeshTetDecomposition::faceTetIndices
     {
         WarningIn
         (
-            "Foam::List<Foam::FixedList<Foam::label, 4> >"
-            "Foam::Cloud<ParticleType>::"
-            "faceTetIndices(label fI, label cI) const"
+            "Foam::List<Foam::tetIndices> "
+            "Foam::polyMeshTetDecomposition::faceTetIndices"
+            "("
+                "const polyMesh&, "
+                "label, "
+                "label"
+            ")"
         )
             << "No base point for face " << fI << ", " << f
             << ", produces a valid tet decomposition."
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 31a4ab79584a9d107b02bb12d5e2ce9aa36445b0..2b9ab5fb778b648c99968a8e4215d42232f0c1e0 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -14,10 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
+    -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
@@ -42,6 +39,7 @@ LIB_LIBS = \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
     -lLESdeltas \
+    -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
     -ldynamicFvMesh \
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index 1e28c87a216b4efbeef4c1fa2d67ca7c64bb5fdd..e775c173b752b36e491660199469c67b894d26f5 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -13,10 +13,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
+    -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
@@ -36,10 +33,14 @@ LIB_LIBS = \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
+    -lincompressibleTurbulenceModel \
+    -lincompressibleRASModels \
+    -lincompressibleLESModels \
     -lcompressibleTurbulenceModel \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
     -lLESdeltas \
+    -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
     -ldynamicFvMesh \
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index 149e09e91bfcd6f3322afe2db7660a070eabdc1a..b01d3b49c74abcd35443a2af49e3da543528d466 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,80 @@ License
 
 #include "DispersionRASModel.H"
 #include "demandDrivenData.H"
+#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "compressible/turbulenceModel/turbulenceModel.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::tmp<Foam::volScalarField>
+Foam::DispersionRASModel<CloudType>::kModel() const
+{
+    const objectRegistry& obr = this->owner().mesh();
+    const word turbName = "turbulenceModel";
+
+    if (obr.foundObject<compressible::turbulenceModel>(turbName))
+    {
+        const compressible::turbulenceModel& model =
+            obr.lookupObject<compressible::turbulenceModel>(turbName);
+        return model.k();
+    }
+    else if (obr.foundObject<incompressible::turbulenceModel>(turbName))
+    {
+        const incompressible::turbulenceModel& model =
+            obr.lookupObject<incompressible::turbulenceModel>(turbName);
+        return model.k();
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "Foam::tmp<Foam::volScalarField>"
+            "Foam::DispersionRASModel<CloudType>::kModel() const"
+        )
+            << "Turbulence model not found in mesh database" << nl
+            << "Database objects include: " << obr.sortedToc()
+            << abort(FatalError);
+
+        return tmp<volScalarField>(NULL);
+    }
+}
+
+
+template<class CloudType>
+Foam::tmp<Foam::volScalarField>
+Foam::DispersionRASModel<CloudType>::epsilonModel() const
+{
+    const objectRegistry& obr = this->owner().mesh();
+    const word turbName = "turbulenceModel";
+
+    if (obr.foundObject<compressible::turbulenceModel>(turbName))
+    {
+        const compressible::turbulenceModel& model =
+            obr.lookupObject<compressible::turbulenceModel>(turbName);
+        return model.epsilon();
+    }
+    else if (obr.foundObject<incompressible::turbulenceModel>(turbName))
+    {
+        const incompressible::turbulenceModel& model =
+            obr.lookupObject<incompressible::turbulenceModel>(turbName);
+        return model.epsilon();
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "Foam::tmp<Foam::volScalarField>"
+            "Foam::DispersionRASModel<CloudType>::epsilonModel() const"
+        )
+            << "Turbulence model not found in mesh database" << nl
+            << "Database objects include: " << obr.sortedToc()
+            << abort(FatalError);
+
+        return tmp<volScalarField>(NULL);
+    }
+}
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -36,16 +110,6 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
 )
 :
     DispersionModel<CloudType>(owner),
-    turbulence_
-    (
-        owner.mesh().objectRegistry::template lookupObject
-        <
-            compressible::RASModel
-        >
-        (
-            "RASProperties"
-        )
-    ),
     kPtr_(NULL),
     ownK_(false),
     epsilonPtr_(NULL),
@@ -60,7 +124,6 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
 )
 :
     DispersionModel<CloudType>(dm),
-    turbulence_(dm.turbulence_),
     kPtr_(dm.kPtr_),
     ownK_(dm.ownK_),
     epsilonPtr_(dm.epsilonPtr_),
@@ -87,7 +150,7 @@ void Foam::DispersionRASModel<CloudType>::cacheFields(const bool store)
 {
     if (store)
     {
-        tmp<volScalarField> tk = this->turbulence().k();
+        tmp<volScalarField> tk = this->kModel();
         if (tk.isTmp())
         {
             kPtr_ = tk.ptr();
@@ -99,7 +162,7 @@ void Foam::DispersionRASModel<CloudType>::cacheFields(const bool store)
             ownK_ = false;
         }
 
-        tmp<volScalarField> tepsilon = this->turbulence().epsilon();
+        tmp<volScalarField> tepsilon = this->epsilonModel();
         if (tepsilon.isTmp())
         {
             epsilonPtr_ = tepsilon.ptr();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index 8b99731f9f77359b8cd490d0b2edc1963fcb030b..c105035c21a556924d2f716c0f69ac52fd8505d2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ Class
     Foam::DispersionRASModel
 
 Description
+    Base class for particle dispersion models based on RAS turbulence.
 
 \*---------------------------------------------------------------------------*/
 
@@ -32,7 +33,6 @@ Description
 #define DispersionRASModel_H
 
 #include "DispersionModel.H"
-#include "RASModel.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,9 +53,6 @@ protected:
 
     // Protected data
 
-        //- Reference to the compressible turbulence model
-        const compressible::RASModel& turbulence_;
-
         // Locally cached turbulence fields
 
             //- Turbulence k
@@ -71,6 +68,15 @@ protected:
             bool ownEpsilon_;
 
 
+    // Protected Functions
+
+        //- Return the k field from the turbulence model
+        tmp<volScalarField> kModel() const;
+
+        //- Return the epsilon field from the turbulence model
+        tmp<volScalarField> epsilonModel() const;
+
+
 public:
 
     //- Runtime type information
@@ -104,12 +110,6 @@ public:
         //- Cache carrier fields
         virtual void cacheFields(const bool store);
 
-        //- Return const access to the turbulence model
-        const compressible::RASModel& turbulence() const
-        {
-            return turbulence_;
-        }
-
 
         // I-O
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 1afc376ca9f824c7b4a400a02251f84e7a44544d..58ffe6b460953c5901fd1ba62d164e76f3fc432f 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,8 @@ License
 #include "BrownianMotionForce.H"
 #include "mathematicalConstants.H"
 #include "demandDrivenData.H"
+#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "compressible/turbulenceModel/turbulenceModel.H"
 
 using namespace Foam::constant;
 
@@ -50,6 +52,41 @@ Foam::scalar Foam::BrownianMotionForce<CloudType>::erfInv(const scalar y) const
 }
 
 
+template<class CloudType>
+Foam::tmp<Foam::volScalarField>
+Foam::BrownianMotionForce<CloudType>::kModel() const
+{
+    const objectRegistry& obr = this->owner().mesh();
+    const word turbName = "turbulenceModel";
+
+    if (obr.foundObject<compressible::turbulenceModel>(turbName))
+    {
+        const compressible::turbulenceModel& model =
+            obr.lookupObject<compressible::turbulenceModel>(turbName);
+        return model.k();
+    }
+    else if (obr.foundObject<incompressible::turbulenceModel>(turbName))
+    {
+        const incompressible::turbulenceModel& model =
+            obr.lookupObject<incompressible::turbulenceModel>(turbName);
+        return model.k();
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "Foam::tmp<Foam::volScalarField>"
+            "Foam::BrownianMotionForce<CloudType>::kModel() const"
+        )
+            << "Turbulence model not found in mesh database" << nl
+            << "Database objects include: " << obr.sortedToc()
+            << abort(FatalError);
+
+        return tmp<volScalarField>(NULL);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
@@ -64,37 +101,9 @@ Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
     rndGen_(owner.rndGen()),
     lambda_(readScalar(this->coeffs().lookup("lambda"))),
     turbulence_(readBool(this->coeffs().lookup("turbulence"))),
-    turbulenceModelPtr_(NULL),
     kPtr_(NULL),
     ownK_(false)
-{
-    if (turbulence_)
-    {
-        HashTable<const compressible::turbulenceModel*> models =
-            this->mesh().objectRegistry::template lookupClass
-            <
-                compressible::turbulenceModel
-            >();
-
-        if (models.size() == 1)
-        {
-            turbulenceModelPtr_ = models.begin()();
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "Foam::BrownianMotionForce<CloudType>::BrownianMotionForce"
-                "("
-                    "CloudType&, "
-                    "const fvMesh&, "
-                    "const dictionary&"
-                ")"
-            )   << "Unable to find a valid turbulence model in mesh database"
-                << exit(FatalError);
-        }
-    }
-}
+{}
 
 
 template<class CloudType>
@@ -107,7 +116,6 @@ Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
     rndGen_(bmf.rndGen_),
     lambda_(bmf.lambda_),
     turbulence_(bmf.turbulence_),
-    turbulenceModelPtr_(NULL),
     kPtr_(NULL),
     ownK_(false)
 {}
@@ -117,9 +125,7 @@ Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
 
 template<class CloudType>
 Foam::BrownianMotionForce<CloudType>::~BrownianMotionForce()
-{
-    turbulenceModelPtr_ = NULL;
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -131,7 +137,7 @@ void Foam::BrownianMotionForce<CloudType>::cacheFields(const bool store)
     {
         if (store)
         {
-            tmp<volScalarField> tk = turbulenceModelPtr_->k();
+            tmp<volScalarField> tk = kModel();
             if (tk.isTmp())
             {
                 kPtr_ = tk.ptr();
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H b/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
index dd6f533fff3a26576332428afa05b4dac80f2a62..b3df4ac786ebf8519f5dc1592fd1f2fb3a2add01 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,6 @@ SourceFiles
 
 #include "ParticleForce.H"
 #include "cachedRandom.H"
-#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,9 +64,6 @@ class BrownianMotionForce
         //- Turbulence flag
         bool turbulence_;
 
-        //- Reference to a compressible turbulence model
-        const compressible::turbulenceModel* turbulenceModelPtr_;
-
         //- Pointer to the turbulence kinetic energy field
         const volScalarField* kPtr_;
 
@@ -80,6 +76,9 @@ class BrownianMotionForce
         //- Inverse erf for Gaussian distribution
         scalar erfInv(const scalar y) const;
 
+        //- Return the k field from the turbulence model
+        tmp<volScalarField> kModel() const;
+
 
 public:
 
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 31a4ab79584a9d107b02bb12d5e2ce9aa36445b0..2b9ab5fb778b648c99968a8e4215d42232f0c1e0 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -14,10 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
+    -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
@@ -42,6 +39,7 @@ LIB_LIBS = \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
     -lLESdeltas \
+    -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
     -ldynamicFvMesh \
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
index 5d4c7a6512d9962987f6e0d7efcfe8a7cad7d618..5b2f1ca871fd70531e242bb2d28f1edb2ff056c5 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -52,7 +52,7 @@ solvers
         solver          GAMG;
         tolerance       0;
         relTol          0.1;
-        smoother        GaussSeidel;
+        smoother        DICGaussSeidel;
         nPreSweeps      0;
         nPostSweeps     2;
         cacheAgglomeration true;
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U1
similarity index 98%
rename from tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U1
index ae67a674957721bfe24172416053144b4bc97625..6272fb918822b948a477372c7182acb492a1ac31 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ua;
+    object      U1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U2
similarity index 98%
rename from tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U2
index 385e1c619629595493023b6450948d491137e898..fb96d28c70508e3e2b87b7290f0f7fc6ff202a54 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U2
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ub;
+    object      U2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha1
similarity index 98%
rename from tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha1
index bd5fc2726748ae001beadf7312533a9a36790ef0..4eedc0954974901d592e4b22a5b2c8ef9a624c46 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U1
similarity index 99%
rename from tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/U1
index 55b7c96498fbf64964ef3bcc87ec10535ef24792..a067cb3d2056171d39715808cb1b052d23e59de8 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ua;
+    object      U1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U2
similarity index 99%
rename from tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/U2
index 4e1775c496a37f3e8144f6136682435d5e7192aa..b77b5382110025b5a5f71caedc492c79a176ded3 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U2
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ub;
+    object      U2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha1
similarity index 99%
rename from tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha1
index a36b4c11786b21926bb44d2a382a82e2f51f902f..1e96e5898358bb009cfc2d4b1e121816bcc02e14 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
index 2221130af6a686d903219c37550643aae1a6d020..2ddae4195c1660416302f266960a8e13d49a5949 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
@@ -15,17 +15,17 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-rhoa            rhoa [ 1 -3 0 0 0 0 0 ] 1;
+rho1            rho1 [ 1 -3 0 0 0 0 0 ] 1;
 
-rhob            rhob [ 1 -3 0 0 0 0 0 ] 1000;
+rho2            rho2 [ 1 -3 0 0 0 0 0 ] 1000;
 
-nua             nua [ 0 2 -1 0 0 0 0 ] 1.6e-05;
+nu1             nu1 [ 0 2 -1 0 0 0 0 ] 1.6e-05;
 
-nub             nub [ 0 2 -1 0 0 0 0 ] 1e-06;
+nu2             nu2 [ 0 2 -1 0 0 0 0 ] 1e-06;
 
-da              da [ 0 1 0 0 0 0 0 ] 0.003;
+d1              d1 [ 0 1 0 0 0 0 0 ] 0.003;
 
-db              db [ 0 1 0 0 0 0 0 ] 0.0001;
+d2              d2 [ 0 1 0 0 0 0 0 ] 0.0001;
 
 Cvm             Cvm [ 0 0 0 0 0 0 0 ] 0.5;
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
index af610d111156ac2a721df5ef46300c94c038dd6d..9e465b42626b91d9c8ea1c723119e11c224b50da 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
@@ -28,20 +28,20 @@ gradSchemes
 divSchemes
 {
     default         none;
-    div(phia,Ua)    Gauss limitedLinearV 1;
-    div(phib,Ub)    Gauss limitedLinearV 1;
-    div(phib,k)     Gauss limitedLinear 1;
-    div(phib,epsilon) Gauss limitedLinear 1;
-    div(phi,alpha)  Gauss limitedLinear01 1;
-    div((-nuEffa*T(grad(Ua)))) Gauss linear;
-    div((-nuEffb*T(grad(Ub)))) Gauss linear;
+    div(phi1,U1)    Gauss limitedLinearV 1;
+    div(phi2,U2)    Gauss limitedLinearV 1;
+    div(phi2,k)     Gauss limitedLinear 1;
+    div(phi2,epsilon) Gauss limitedLinear 1;
+    div(phi,alpha1)  Gauss limitedLinear01 1;
+    div((-nuEff1*T(grad(U1)))) Gauss linear;
+    div((-nuEff2*T(grad(U2)))) Gauss linear;
 }
 
 laplacianSchemes
 {
     default         none;
-    laplacian(nuEffa,Ua) Gauss linear corrected;
-    laplacian(nuEffb,Ub) Gauss linear corrected;
+    laplacian(nuEff1,U1) Gauss linear corrected;
+    laplacian(nuEff2,U2) Gauss linear corrected;
     laplacian((rho*(1|A(U))),p) Gauss linear corrected;
 }
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
index e24097f06ea7639c7708bf68e3e7a6914a112f54..f9046b1447add4e64a7973bcd51ea70ee529581b 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
@@ -32,7 +32,7 @@ solvers
         relTol          0;
     }
 
-    alpha
+    alpha1
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -40,9 +40,9 @@ solvers
         relTol          0.1;
     }
 
-    alphaFinal
+    alpha1Final
     {
-        $alpha;
+        $alpha1;
         tolerance       1e-10;
         relTol          0;
     }
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
index 09793d11594b76afe9f1fbd025f275b471857fa1..f401f8d162d966efdefbc063cd557893734d35da 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
@@ -21,25 +21,25 @@ FoamFile
     {
         type            patch;
         nFaces          51;
-        startFace       15151;
+        startFace       57362;
     }
     outlet
     {
         type            patch;
         nFaces          51;
-        startFace       15202;
+        startFace       57413;
     }
     walls
     {
         type            wall;
-        nFaces          436;
-        startFace       15253;
+        nFaces          836;
+        startFace       57464;
     }
     frontBack
     {
         type            empty;
-        nFaces          15420;
-        startFace       15689;
+        nFaces          57540;
+        startFace       58300;
     }
 )
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
index 0daf73a08db5e3dd463f35bd9a486b223084ee59..e48eb3773be70a12e8999832841da6c03accd700 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
@@ -21,25 +21,25 @@ FoamFile
     {
         type            patch;
         nFaces          510;
-        startFace       220900;
+        startFace       4413730;
     }
     outlet
     {
         type            patch;
         nFaces          510;
-        startFace       221410;
+        startFace       4414240;
     }
     walls
     {
         type            wall;
-        nFaces          4360;
-        startFace       221920;
+        nFaces          37840;
+        startFace       4414750;
     }
     frontBack
     {
         type            wall;
-        nFaces          15420;
-        startFace       226280;
+        nFaces          57540;
+        startFace       4452590;
     }
 )
 
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
index b9c62baa400f853d3f1cfe255d29cf86580a6a00..03d26bcf3c96c86ca8ecf11604193892ebc80d29 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
@@ -21,25 +21,25 @@ FoamFile
     {
         type            patch;
         nFaces          51;
-        startFace       15151;
+        startFace       57362;
     }
     outlet
     {
         type            patch;
         nFaces          51;
-        startFace       15202;
+        startFace       57413;
     }
     walls
     {
         type            wall;
-        nFaces          436;
-        startFace       15253;
+        nFaces          836;
+        startFace       57464;
     }
     frontBack
     {
         type            empty;
-        nFaces          15420;
-        startFace       15689;
+        nFaces          57540;
+        startFace       58300;
     }
 )
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary
index 4f2ccc2ae0f52f82df1efbda2e5ae9aa4d5e6681..1543006b7ac2cf94c682d7432780a0bd0d678615 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary
@@ -21,19 +21,19 @@ FoamFile
     {
         type            wall;
         nFaces          11200;
-        startFace       281600;
+        startFace       277808;
     }
     atmosphere
     {
         type            patch;
         nFaces          1600;
-        startFace       292800;
+        startFace       289008;
     }
     floatingObject
     {
         type            wall;
-        nFaces          0;
-        startFace       294400;
+        nFaces          672;
+        startFace       290608;
     }
 )
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
index 187397ebf070061db4dc903fee6f8aad58cd37f9..b393a341aa9050a1e62b9a41d3847adca5c6db7e 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
@@ -15,25 +15,31 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-3
+4
 (
     inlet
     {
         type            patch;
         nFaces          225;
-        startFace       32025;
+        startFace       1129981;
     }
     outlet
     {
         type            patch;
         nFaces          225;
-        startFace       32250;
+        startFace       1130206;
     }
     walls
     {
         type            symmetryPlane;
         nFaces          3000;
-        startFace       32475;
+        startFace       1130431;
+    }
+    bullet
+    {
+        type            wall;
+        nFaces          37743;
+        startFace       1133431;
     }
 )
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/U1
similarity index 96%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/U1
index a43dc9ad09661d9a2c1cf9c921f1cc3752845d1f..c2f2c5bbf419e42aa0e44932269b3409cd6642a3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/U1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ua;
+    object      U1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -29,7 +29,7 @@ boundaryField
     top
     {
         type               pressureInletOutletVelocity;
-        phi                phia;
+        phi                phi1;
         value              $internalField;
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/U2
similarity index 96%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/U2
index 2a263a3ca2a2c40770e4359caa69ef0c239091d7..cac8f03c5b0ed68367fdb104249cac7c7e94e526 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/U2
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ub;
+    object      U2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -29,7 +29,7 @@ boundaryField
     top
     {
         type               pressureInletOutletVelocity;
-        phi                phib;
+        phi                phi2;
         value              $internalField;
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha1
similarity index 98%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha1
index 1f25daa24c384fe250243be4e4fedce57fd8d193..e5c00d86a00abb7c0461bc42044d50fbbb82b4e5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties
index 0e47a29149663fad4e26979cdfbb42359f073ee1..d03f23a29514c057e30346994f865f551148ce69 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties
@@ -15,11 +15,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dragModela      GidaspowSchillerNaumann;
+dragModel1      GidaspowSchillerNaumann;
 
-dragModelb      GidaspowSchillerNaumann;
+dragModel2      GidaspowSchillerNaumann;
 
-dragPhase       a;
+dragPhase       "1";
 
 residualSlip    0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
index 53521fbae309deb8893eed645ceaf0776fb9786a..9dfe7e43dee4f9d7eff91d9f5d0d586305f53418 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
@@ -21,9 +21,9 @@ equilibrium     on;
 
 e               e [ 0 0 0 0 0 0 0 ] 0.9;
 
-alphaMax        alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
+alpha1Max        alpha1Max [ 0 0 0 0 0 0 0 ] 0.6;
 
-alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;
+alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.5;
 
 Fr              Fr [ 1 -1 -2 0 0 0 0 ] 0.05;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties
index 8188872bbc75b7038e2cedec11022db7371e4097..db0661409a7078c6b8f0458e2803a59d68abbc02 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties
@@ -19,7 +19,7 @@ preAlphaExp     500;
 
 expMax          1000;
 
-alphaMax        0.6;
+alpha1Max        0.6;
 
 g0              g0 [ 1 -1 -2 0 0 0 0 ] 1000;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties
index 41535f01eff7e06024cd429160a7bf282594bed8..ef9a0fccf7ebf3a1cae087fd9ceab3414a7f50b2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties
@@ -15,14 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phasea
+phase1
 {
     rho             rho [ 1 -3 0 0 0 ] 2640;
     nu              nu [ 0 2 -1 0 0 ] 1e-06;
     d               d [ 0 1 0 0 0 0 0 ] 0.00048;
 }
 
-phaseb
+phase2
 {
     rho             rho [ 1 -3 0 0 0 ] 1.28;
     nu              nu [ 0 2 -1 0 0 ] 1.328e-05;
@@ -35,7 +35,7 @@ Cl              Cl [ 0 0 0 0 0 ] 0;
 
 Ct              Ct [ 0 0 0 0 0 ] 0;
 
-alphaAlpha      alphaAlpha [ 0 0 0 0 0 ] 0;
+alpha1Alpha      alpha1Alpha [ 0 0 0 0 0 ] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index ec37af9d408943dff73fd7f7745939919de3c4ef..98888b320fd581fab1a1a7744df63b8c67d8ea46 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -60,21 +60,21 @@ functions
         outputControl   outputTime;
         fields
         (
-            Ua
+            U1
             {
                  mean        on;
                  prime2Mean  off;
                  base        time;
             }
 
-            Ub
+            U2
             {
                  mean        on;
                  prime2Mean  off;
                  base        time;
             }
 
-            alpha
+            alpha1
             {
                  mean        on;
                  prime2Mean  off;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
index 5296dc91b91099c018ac78913e5326e3fd1693ab..5d3f30355dcd4d4fd8ce3032923e9dd7a0ead4f6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
@@ -28,24 +28,24 @@ gradSchemes
 divSchemes
 {
     default         none;
-    div(phia,Ua)    Gauss limitedLinearV 1;
-    div(phib,Ub)    Gauss limitedLinearV 1;
-    div(phib,k)     Gauss limitedLinear 1;
-    div(phib,epsilon) Gauss limitedLinear 1;
-    div(phi,alpha)  Gauss limitedLinear01 1;
-    div(phir,alpha) Gauss limitedLinear01 1;
+    div(phi1,U1)    Gauss limitedLinearV 1;
+    div(phi2,U2)    Gauss limitedLinearV 1;
+    div(phi2,k)     Gauss limitedLinear 1;
+    div(phi2,epsilon) Gauss limitedLinear 1;
+    div(phi,alpha1)  Gauss limitedLinear01 1;
+    div(phir,alpha1) Gauss limitedLinear01 1;
     div(phi,Theta)  Gauss limitedLinear 1;
-    div(Rca)        Gauss linear;
-    div(Rcb)        Gauss linear;
+    div(Rc1)        Gauss linear;
+    div(Rc2)        Gauss linear;
 }
 
 laplacianSchemes
 {
     default         none;
-    laplacian(nuEffa,Ua) Gauss linear corrected;
-    laplacian(nuEffb,Ub) Gauss linear corrected;
+    laplacian(nuEff1,U1) Gauss linear corrected;
+    laplacian(nuEff2,U2) Gauss linear corrected;
     laplacian(Dp,p) Gauss linear corrected;
-    laplacian(alphaPpMag,alpha) Gauss linear corrected;
+    laplacian(alpha1PpMag,alpha1) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
 }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
index 0a424bff8ea79e43e7f36d48ac99f760c759a88e..bdb02666e34b4bd55546ef3a66204ff11f3f10e5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
@@ -63,7 +63,7 @@ solvers
         relTol          0.1;
     }
 
-    alphaFinal
+    alpha1Final
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/U1
similarity index 96%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/U1
index 2fd050fcc36f18f99ae9484f52b773b08a8bb631..699b0ed4052f838d32a5f5f39cf64044c2d46bfa 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/U1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ua;
+    object      U1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -28,7 +28,7 @@ boundaryField
     outlet
     {
         type               pressureInletOutletVelocity;
-        phi                phia;
+        phi                phi1;
         value              $internalField;
     }
     inlet
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/U2
similarity index 96%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/U2
index fe078db58a347ca50825792f965675b971bec51a..94d9852112bd6b4cc5c10c0159b1a0a63479d647 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/U2
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ub;
+    object      U2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -28,7 +28,7 @@ boundaryField
     outlet
     {
         type               pressureInletOutletVelocity;
-        phi                phib;
+        phi                phi2;
         value              $internalField;
     }
     inlet
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1
similarity index 99%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1
index df5fa594a310313677cb4131bd178df4bd89b9ff..0efa9947dfe76b1c7362447a074327a56be63190 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties
index 4896ae1bfdc03b1db02870f3f711d373ae29a145..89a788daeb62f0dfb14ef9b8aa9b233881b0f01c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties
@@ -15,11 +15,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dragModela      GidaspowErgunWenYu;
+dragModel1      GidaspowErgunWenYu;
 
-dragModelb      GidaspowErgunWenYu;
+dragModel2      GidaspowErgunWenYu;
 
-dragPhase       a;
+dragPhase       "1";
 
 residualSlip    0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
index 4433c0caf481d99d0aa9f982cf9d6dc73af4db2d..287bb45221e586d44b0232fc89db955ab6bd358b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
@@ -21,9 +21,9 @@ equilibrium     on;
 
 e               e [ 0 0 0 0 0 0 0 ] 0.8;
 
-alphaMax        alphaMax [ 0 0 0 0 0 0 0 ] 0.62;
+alpha1Max        alpha1Max [ 0 0 0 0 0 0 0 ] 0.62;
 
-alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.65;
+alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.65;
 
 Fr              Fr [ 1 -1 -2 0 0 0 0 ] 0.05;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties
index f6416561c0ae471b7d9191871e2c6bcd33667bda..5cd0d1aca1b526f0c8522d4b1386c16265e2148f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties
@@ -19,7 +19,7 @@ preAlphaExp     500;
 
 expMax          1000;
 
-alphaMax        0.62;
+alpha1Max        0.62;
 
 g0              g0 [ 1 -1 -2 0 0 0 0 ] 0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties
index 5091890def0a01f76cff8de353054987f1b370c0..859bd94263b9a0feb42e07c489ff4d1a48b79beb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties
@@ -15,14 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phasea
+phase1
 {
     rho             rho [ 1 -3 0 0 0 ] 2500;
     nu              nu [ 0 2 -1 0 0 ] 1e-06;
     d               d [ 0 1 0 0 0 0 0 ] 0.0003;
 }
 
-phaseb
+phase2
 {
     rho             rho [ 1 -3 0 0 0 ] 1.2;
     nu              nu [ 0 2 -1 0 0 ] 1.5e-05;
@@ -35,7 +35,7 @@ Cl              Cl [ 0 0 0 0 0 ] 0;
 
 Ct              Ct [ 0 0 0 0 0 ] 0;
 
-alphaAlpha      alphaAlpha [ 0 0 0 0 0 ] 0;
+alpha1Alpha      alpha1Alpha [ 0 0 0 0 0 ] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index 2483ee57263306c699fa1c9d3c8122f0ee564b2a..0b9f0e2e9ce22faa0c22d63b5a22901c2f45ef6b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -60,21 +60,21 @@ functions
         outputControl   outputTime;
         fields
         (
-            Ua
+            U1
             {
                  mean        on;
                  prime2Mean  off;
                  base        time;
             }
 
-            Ub
+            U2
             {
                  mean        on;
                  prime2Mean  off;
                  base        time;
             }
 
-            alpha
+            alpha1
             {
                  mean        on;
                  prime2Mean  off;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
index ab4c5fa0ebdc9b1859d606094403ae1466b29ab2..86f7b1bf4b4780d34afbe7d204f8915df6df493e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
@@ -28,25 +28,25 @@ gradSchemes
 divSchemes
 {
     default         none;
-    div(phia,Ua)    Gauss limitedLinearV 1;
-    div(phib,Ub)    Gauss limitedLinearV 1;
-    div(phib,k)     Gauss limitedLinear 1;
-    div(phib,epsilon) Gauss limitedLinear 1;
-    div(phi,alpha)  Gauss limitedLinear01 1;
-    div(phir,alpha) Gauss limitedLinear01 1;
+    div(phi1,U1)    Gauss limitedLinearV 1;
+    div(phi2,U2)    Gauss limitedLinearV 1;
+    div(phi2,k)     Gauss limitedLinear 1;
+    div(phi2,epsilon) Gauss limitedLinear 1;
+    div(phi,alpha1)  Gauss limitedLinear01 1;
+    div(phir,alpha1) Gauss limitedLinear01 1;
     div(phi,Theta)  Gauss limitedLinear 1;
-    div(Rca)        Gauss linear;
-    div(Rcb)        Gauss linear;
+    div(Rc1)        Gauss linear;
+    div(Rc2)        Gauss linear;
 }
 
 laplacianSchemes
 {
     default         none;
-    laplacian(nuEffa,Ua) Gauss linear corrected;
-    laplacian(nuEffb,Ub) Gauss linear corrected;
+    laplacian(nuEff1,U1) Gauss linear corrected;
+    laplacian(nuEff2,U2) Gauss linear corrected;
     laplacian(Dp,p) Gauss linear corrected;
-    laplacian(alphaPpMag,alpha) Gauss linear corrected;
-    laplacian(Galphaf,alpha) Gauss linear corrected;
+    laplacian(alpha1PpMag,alpha1) Gauss linear corrected;
+    laplacian(Galpha1f,alpha1) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
     laplacian(kappa,Theta) Gauss linear corrected;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
index 0a424bff8ea79e43e7f36d48ac99f760c759a88e..bdb02666e34b4bd55546ef3a66204ff11f3f10e5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
@@ -63,7 +63,7 @@ solvers
         relTol          0.1;
     }
 
-    alphaFinal
+    alpha1Final
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict
index f56aaf454ee663fa5d7f7e0abbe5e3c070a9ae97..8347405ba76b4e99de866bf32c536313cec19d29 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict
@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues ( volScalarFieldValue alpha 0 );
+defaultFieldValues ( volScalarFieldValue alpha1 0 );
 
-regions         ( boxToCell { box ( 0 0 -0.1 ) ( 0.15 0.5 0.1 ) ; fieldValues ( volScalarFieldValue alpha 0.55 ) ; } );
+regions         ( boxToCell { box ( 0 0 -0.1 ) ( 0.15 0.5 0.1 ) ; fieldValues ( volScalarFieldValue alpha1 0.55 ) ; } );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/U1
similarity index 99%
rename from tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/U1
index 51a58827bd13ab0fbd890d41d5612d5e84e25a7b..9e7960e63ef9035bae833bf14afcc505ec4694da 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/U1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ua;
+    object      U1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -1908,7 +1908,7 @@ boundaryField
     outlet
     {
         type            pressureInletOutletVelocity;
-        phi             phia;
+        phi             phi1;
         value           nonuniform List<vector>
 25
 (
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/U2
similarity index 99%
rename from tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/U2
index 6bcd47e0433a3ec5feb8cb21e02f680cc0031287..0c77c4705d077be85df8330912d9a4c4d1a4b5d0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/U2
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Ub;
+    object      U2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -1908,7 +1908,7 @@ boundaryField
     outlet
     {
         type            pressureInletOutletVelocity;
-        phi             phib;
+        phi             phi2;
         value           nonuniform List<vector>
 25
 (
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha1
similarity index 99%
rename from tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha1
index a36b4c11786b21926bb44d2a382a82e2f51f902f..1e96e5898358bb009cfc2d4b1e121816bcc02e14 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
index 51e5a32fe8c2364fe30b7d65eddc45b6f01cb09b..fb97f11e68211fc98a791e977144defa63b13bb2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dragModela      SchillerNaumann;
+dragModel1      SchillerNaumann;
 
-dragModelb      SchillerNaumann;
+dragModel2      SchillerNaumann;
 
 dragPhase       blended;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
index 53521fbae309deb8893eed645ceaf0776fb9786a..9dfe7e43dee4f9d7eff91d9f5d0d586305f53418 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
@@ -21,9 +21,9 @@ equilibrium     on;
 
 e               e [ 0 0 0 0 0 0 0 ] 0.9;
 
-alphaMax        alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
+alpha1Max        alpha1Max [ 0 0 0 0 0 0 0 ] 0.6;
 
-alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;
+alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.5;
 
 Fr              Fr [ 1 -1 -2 0 0 0 0 ] 0.05;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties
index eddbfd7ad7910a8a85af9c310b1424eb18d3eb1e..1f92776ea98c5cc4b1022910ae279efabc66a122 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties
@@ -19,7 +19,7 @@ preAlphaExp     300;
 
 expMax          10;
 
-alphaMax        0.6;
+alpha1Max        0.6;
 
 g0              g0 [ 1 -1 -2 0 0 0 0 ] 0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
index 039785d887d5fbc4e94e60ef8a9aa97ee0412db8..276c521ad3c505013c1cddb3b71b1d7074dbca50 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
@@ -15,20 +15,20 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phaseb
-{
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    d               d [ 0 1 0 0 0 0 0 ] 0.0001;
-}
-
-phasea
+phase1
 {
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.6e-05;
     rho             rho [ 1 -3 0 0 0 0 0 ] 1;
     d               d [ 0 1 0 0 0 0 0 ] 0.003;
 }
 
+phase2
+{
+    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
+    d               d [ 0 1 0 0 0 0 0 ] 0.0001;
+}
+
 Cvm             Cvm [ 0 0 0 0 0 0 0 ] 0.5;
 
 Cl              Cl [ 0 0 0 0 0 0 0 ] 0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index e41b2d8bdfbef7771a2774fd48782759bb9a7371..d7e0530f04490f0fda41b324ffda6126aa07700e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -60,21 +60,21 @@ functions
         outputControl   outputTime;
         fields
         (
-            Ua
+            U1
             {
                  mean        on;
                  prime2Mean  off;
                  base        time;
             }
 
-            Ub
+            U2
             {
                  mean        on;
                  prime2Mean  off;
                  base        time;
             }
 
-            alpha
+            alpha1
             {
                  mean        on;
                  prime2Mean  off;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
index 470c7aae79a8fb129be104b9e54fa91ebe011472..8224b34cb8dd344ddbcef331a531c23520b56725 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -28,26 +28,26 @@ gradSchemes
 divSchemes
 {
     default         none;
-    div(phia,Ua)    Gauss limitedLinearV 1;
-    div(phib,Ub)    Gauss limitedLinearV 1;
-    div(phib,k)     Gauss limitedLinear 1;
-    div(phib,epsilon) Gauss limitedLinear 1;
-    div(phi,alpha)  Gauss limitedLinear01 1;
-    div(phir,alpha) Gauss limitedLinear01 1;
+    div(phi1,U1)    Gauss limitedLinearV 1;
+    div(phi2,U2)    Gauss limitedLinearV 1;
+    div(phi2,k)     Gauss limitedLinear 1;
+    div(phi2,epsilon) Gauss limitedLinear 1;
+    div(phi,alpha1)  Gauss limitedLinear01 1;
+    div(phir,alpha1) Gauss limitedLinear01 1;
     div(phi,Theta)  Gauss limitedLinear 1;
-    div(Rca)        Gauss linear;
-    div(Rcb)        Gauss linear;
+    div(Rc1)        Gauss linear;
+    div(Rc2)        Gauss linear;
 }
 
 laplacianSchemes
 {
     default         none;
-    laplacian(nuEffa,Ua) Gauss linear corrected;
-    laplacian(nuEffb,Ub) Gauss linear corrected;
+    laplacian(nuEff1,U1) Gauss linear corrected;
+    laplacian(nuEff2,U2) Gauss linear corrected;
     laplacian(Dp,p) Gauss linear corrected;
-    laplacian(alphaPpMag,alpha) Gauss linear corrected;
-    laplacian((alphak*nuEffb),k) Gauss linear corrected;
-    laplacian((alphaEps*nuEffb),epsilon) Gauss linear corrected;
+    laplacian(alpha1PpMag,alpha1) Gauss linear corrected;
+    laplacian((alpha1k*nuEff2),k) Gauss linear corrected;
+    laplacian((alpha1Eps*nuEff2),epsilon) Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
index d9f24777fee86c04422c0414c2a488d2a7435350..190811b840b56c5bf99fcc45b915a83e9bfa23ef 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
@@ -63,7 +63,7 @@ solvers
         relTol          0.1;
     }
 
-    alphaFinal
+    alpha1Final
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -86,7 +86,7 @@ relaxationFactors
 {
     "U.*"           1;
     "T.*"           1;
-    "alpha.*"       1;
+    "alpha1.*"       1;
     "Theta.*"       1;
     "k.*"           1;
     "epsilon.*"     1;