diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun
index d762106b7e..9dfacf68e2 100755
--- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun
@@ -74,9 +74,9 @@ plot \
     'postProcessing_'.gY0.'_'.lY0.'/plot/0/T.liquid' w l lc 2 t 'Liquid', \
     for [gY in gYs] for [lY in lYs] \
     'postProcessing_'.gY.'_'.lY.'/plot/0/T.liquid' w l lc 2 notitle, \
-    'postProcessing_'.gY0.'_'.lY0.'/plot/0/interfaceCompositionPhaseChange:Tf.gasAndLiquid' w l lc 3 t 'Interface', \
+    'postProcessing_'.gY0.'_'.lY0.'/plot/0/interfaceCompositionPhaseChange:Tf.gas_liquid' w l lc 3 t 'Interface', \
     for [gY in gYs] for [lY in lYs] \
-    'postProcessing_'.gY.'_'.lY.'/plot/0/interfaceCompositionPhaseChange:Tf.gasAndLiquid' w l lc 3 notitle
+    'postProcessing_'.gY.'_'.lY.'/plot/0/interfaceCompositionPhaseChange:Tf.gas_liquid' w l lc 3 notitle
 
 set ytics nomirror
 set y2tics
diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/plot b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/plot
index 3fafab5445..b9eb993157 100644
--- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/plot
+++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/plot
@@ -25,7 +25,7 @@ fields
     p
     T.gas
     T.liquid
-    interfaceCompositionPhaseChange:Tf.gasAndLiquid
+    interfaceCompositionPhaseChange:Tf.gas_liquid
     dMass.gas
     dMass.liquid
     dMass
diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun
index df7c78daf0..9641b9c49d 100755
--- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun
@@ -109,9 +109,9 @@ plot \
     'postProcessing_'.gY0.'_'.gHe0.'_'.lHe0.'/plot/0/T.liquid' w l lc 2 t 'Liquid', \
     for [gY in gYs] for [ gHe in gHes ] for [ lHe in lHes ] \
     'postProcessing_'.gY.'_'.gHe.'_'.lHe.'/plot/0/T.liquid' w l lc 2 notitle, \
-    'postProcessing_'.gY0.'_'.gHe0.'_'.lHe0.'/plot/0/interfaceCompositionPhaseChange:Tf.gasAndLiquid' w l lc 3 t 'Interface', \
+    'postProcessing_'.gY0.'_'.gHe0.'_'.lHe0.'/plot/0/interfaceCompositionPhaseChange:Tf.gas_liquid' w l lc 3 t 'Interface', \
     for [gY in gYs] for [ gHe in gHes ] for [ lHe in lHes ] \
-    'postProcessing_'.gY.'_'.gHe.'_'.lHe.'/plot/0/interfaceCompositionPhaseChange:Tf.gasAndLiquid' w l lc 3 notitle
+    'postProcessing_'.gY.'_'.gHe.'_'.lHe.'/plot/0/interfaceCompositionPhaseChange:Tf.gas_liquid' w l lc 3 notitle
 
 set ytics nomirror
 set y2tics
diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/plot b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/plot
index b0d95890d2..38996e7fc3 100644
--- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/plot
+++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/plot
@@ -22,7 +22,7 @@ fields
     p
     T.gas
     T.liquid
-    interfaceCompositionPhaseChange:Tf.gasAndLiquid
+    interfaceCompositionPhaseChange:Tf.gas_liquid
     dMass.gas
     dMass.liquid
     dMass
diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun
index 7cc4e78579..432ac9f2bd 100755
--- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun
@@ -81,9 +81,9 @@ plot \
     'postProcessing_'.gHe0.'_'.lHe0.'/plot/0/T.water' w l lc 2 t 'Water', \
     for [gHe in gHes] for [lHe in lHes] \
     'postProcessing_'.gHe.'_'.lHe.'/plot/0/T.water' w l lc 2 notitle, \
-    'postProcessing_'.gHe0.'_'.lHe0.'/plot/0/thermalPhaseChange:Tf.steamAndWater' w l lc 3 t 'Interface', \
+    'postProcessing_'.gHe0.'_'.lHe0.'/plot/0/thermalPhaseChange:Tf.steam_water' w l lc 3 t 'Interface', \
     for [gHe in gHes] for [lHe in lHes] \
-    'postProcessing_'.gHe.'_'.lHe.'/plot/0/thermalPhaseChange:Tf.steamAndWater' w l lc 3 notitle
+    'postProcessing_'.gHe.'_'.lHe.'/plot/0/thermalPhaseChange:Tf.steam_water' w l lc 3 notitle
 
 set ytics nomirror
 set y2tics
diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/plot b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/plot
index b2feef81f9..671b7c3c1e 100644
--- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/plot
+++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/plot
@@ -22,7 +22,7 @@ fields
     p
     T.steam
     T.water
-    thermalPhaseChange:Tf.steamAndWater
+    thermalPhaseChange:Tf.steam_water
     dMass.steam
     dMass.water
     dMass
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties
index d5b4a5e95d..a8a0e933aa 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties
@@ -104,7 +104,7 @@ populationBalanceCoeffs
         (
             phaseChange
             {
-                pairs   ((gas and liquid));
+                interfaces (gas_liquid);
                 dmdtf   thermalPhaseChange:dmdtf;
             }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
index 2c30738baf..284a5a9667 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
@@ -130,8 +130,8 @@ populationBalanceCoeffs
         (
             phaseChange
             {
-                pairs ((gas and liquid) (gas2 and liquid));
-                dmdtf thermalPhaseChange:dmdtf;
+                interfaces (gas_liquid gas2_liquid);
+                dmdtf   thermalPhaseChange:dmdtf;
             }
 
             densityChange
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.air.orig b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.air.orig
index 5c87074175..af9688ef3a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.air.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.air.orig
@@ -22,17 +22,38 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            oil             { theta0 90; }
+            water           { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            oil             { theta0 90; }
+            water           { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            oil             { theta0 90; }
+            water           { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.mercury.orig b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.mercury.orig
index 41dfdde528..315725af07 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.mercury.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.mercury.orig
@@ -22,17 +22,38 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            oil             { theta0 90; }
+            water           { theta0 90; }
+        }
+        value           $internalField;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            oil             { theta0 90; }
+            water           { theta0 90; }
+        }
+        value           $internalField;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            oil             { theta0 90; }
+            water           { theta0 90; }
+        }
+        value           $internalField;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.oil.orig b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.oil.orig
index 5801e2764b..d033ec95f1 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.oil.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.oil.orig
@@ -22,17 +22,38 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            water           { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            water           { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            water           { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.water.orig b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.water.orig
index db6846910a..a457ee2f84 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.water.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/alpha.water.orig
@@ -22,17 +22,38 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            oil             { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            oil             { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            alphaContactAngle;
+        contactAngleProperties
+        {
+            air             { theta0 90; }
+            oil             { theta0 90; }
+            mercury         { theta0 90; }
+        }
+        value           $internalField;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
index 4420aceb20..72735e73a1 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
@@ -24,7 +24,7 @@ stopAt          endTime;
 
 endTime         6;
 
-deltaT          0.001;
+deltaT          0.0001;
 
 writeControl    adjustableRunTime;
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties
index 55cf0be9ae..730a79c2d1 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties
@@ -119,7 +119,7 @@ populationBalanceCoeffs
         (
             phaseChange
             {
-                pairs               ((particles and vapor));
+                interfaces          (particles_vapor);
                 dmdtf               phaseTransfer:dmidtf;
                 specie              TiO2_s;
                 surfaceGrowthType   ParkRogak;