From 9adabe8cbdfef5b315cee625de89c24072d0f1d4 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Tue, 24 Jan 2023 09:15:16 +0000
Subject: [PATCH] compressible::alphatWallBoilingWallFunction: Naming
 consistency

Tutorials have been updated to use the new consistent names within the
wall boiling system. The changes are backwards compatible so all
tutorials should run both before and after this change.
---
 .../CHT/wallBoiling/0/fluid/alphat.gas        |  2 +-
 .../CHT/wallBoiling/0/fluid/alphat.liquid     |  4 ++--
 .../CHT/wallBoiling/validation/createGraphs   |  4 ++--
 .../0/{Ar.vapor.orig => Ar.vapour.orig}       |  2 +-
 .../0/{TiO2.vapor.orig => Cl2.vapour.orig}    |  2 +-
 .../0/{Cl2.vapor.orig => N2.vapour.orig}      |  2 +-
 .../0/O2.vapour.orig}                         |  2 +-
 .../titaniaSynthesis/0/{T.vapor => T.vapour}  |  2 +-
 .../0/{TiCl4.vapor.orig => TiCl4.vapour.orig} |  2 +-
 .../0/{N2.vapor.orig => TiO2.vapour.orig}     |  2 +-
 .../titaniaSynthesis/0/{U.vapor => U.vapour}  |  4 ++--
 .../0/{alpha.vapor.orig => alpha.vapour.orig} |  0
 .../multiphaseEuler/titaniaSynthesis/0/p_rgh  |  6 +++---
 .../constant/chemistryProperties.vapour}      |  2 +-
 ...ties.vapor => combustionProperties.vapour} |  2 +-
 ...ansport.vapor => momentumTransport.vapour} |  2 +-
 .../titaniaSynthesis/constant/phaseProperties | 18 ++++++++---------
 .../constant/physicalProperties.vapour}       |  4 ++--
 .../{reactions.vapor => reactions.vapour}     |  2 +-
 .../constant/{thermo.vapor => thermo.vapour}  |  2 +-
 .../titaniaSynthesis/system/controlDict       |  2 +-
 .../0/{Ar.vapor.orig => Ar.vapour.orig}       |  2 +-
 .../0/O2.vapour.orig}                         |  2 +-
 .../0/{T.vapor => T.vapour}                   |  2 +-
 .../0/{TiCl4.vapor.orig => TiCl4.vapour.orig} |  2 +-
 .../0/{U.vapor => U.vapour}                   |  4 ++--
 ...efault.vapor.orig => Ydefault.vapour.orig} |  2 +-
 .../0/{alpha.vapor.orig => alpha.vapour.orig} |  0
 .../titaniaSynthesisSurface/0/p_rgh           |  6 +++---
 .../constant/chemistryProperties.vapour}      |  2 +-
 ...ties.vapor => combustionProperties.vapour} |  2 +-
 ...ansport.vapor => momentumTransport.vapour} |  2 +-
 .../constant/phaseProperties                  | 20 +++++++++----------
 .../constant/physicalProperties.vapour}       |  4 ++--
 .../{reactions.vapor => reactions.vapour}     |  2 +-
 .../constant/{thermo.vapor => thermo.vapour}  |  2 +-
 .../system/controlDict                        |  2 +-
 .../wallBoilingIATE/0/alphat.gas              |  2 +-
 .../wallBoilingIATE/0/alphat.liquid           |  4 ++--
 .../wallBoilingIATE/validation/createGraphs   |  4 ++--
 .../wallBoilingPolydisperse/0/alphat.gas      |  2 +-
 .../wallBoilingPolydisperse/0/alphat.liquid   |  4 ++--
 .../validation/createGraphs                   |  4 ++--
 .../0/alphat.gas                              |  2 +-
 .../0/alphat.gas2                             |  2 +-
 .../0/alphat.liquid                           |  4 ++--
 .../validation/createGraphs                   |  4 ++--
 47 files changed, 78 insertions(+), 78 deletions(-)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/0/{Ar.vapor.orig => Ar.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/0/{TiO2.vapor.orig => Cl2.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/0/{Cl2.vapor.orig => N2.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/{titaniaSynthesisSurface/0/O2.vapor.orig => titaniaSynthesis/0/O2.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/0/{T.vapor => T.vapour} (98%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/0/{TiCl4.vapor.orig => TiCl4.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/0/{N2.vapor.orig => TiO2.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/0/{U.vapor => U.vapour} (94%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/0/{alpha.vapor.orig => alpha.vapour.orig} (100%)
 rename tutorials/modules/multiphaseEuler/{titaniaSynthesisSurface/constant/chemistryProperties.vapor => titaniaSynthesis/constant/chemistryProperties.vapour} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/{combustionProperties.vapor => combustionProperties.vapour} (93%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/{momentumTransport.vapor => momentumTransport.vapour} (94%)
 rename tutorials/modules/multiphaseEuler/{titaniaSynthesisSurface/constant/physicalProperties.vapor => titaniaSynthesis/constant/physicalProperties.vapour} (91%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/{reactions.vapor => reactions.vapour} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/{thermo.vapor => thermo.vapour} (99%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/{Ar.vapor.orig => Ar.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/{titaniaSynthesis/0/O2.vapor.orig => titaniaSynthesisSurface/0/O2.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/{T.vapor => T.vapour} (98%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/{TiCl4.vapor.orig => TiCl4.vapour.orig} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/{U.vapor => U.vapour} (94%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/{Ydefault.vapor.orig => Ydefault.vapour.orig} (96%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/{alpha.vapor.orig => alpha.vapour.orig} (100%)
 rename tutorials/modules/multiphaseEuler/{titaniaSynthesis/constant/chemistryProperties.vapor => titaniaSynthesisSurface/constant/chemistryProperties.vapour} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/{combustionProperties.vapor => combustionProperties.vapour} (93%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/{momentumTransport.vapor => momentumTransport.vapour} (94%)
 rename tutorials/modules/multiphaseEuler/{titaniaSynthesis/constant/physicalProperties.vapor => titaniaSynthesisSurface/constant/physicalProperties.vapour} (91%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/{reactions.vapor => reactions.vapour} (97%)
 rename tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/{thermo.vapor => thermo.vapour} (99%)

diff --git a/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.gas
index 0bc8ec3dad..b985d62abc 100644
--- a/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.gas
@@ -33,7 +33,7 @@ boundaryField
     {
         type            compressible::alphatWallBoilingWallFunction;
         otherPhase      liquid;
-        phaseType       vapor;
+        phaseType       vapour;
         Prt             0.85;
         partitioningModel
         {
diff --git a/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.liquid
index ac08737bb0..4d6fe3d4e2 100644
--- a/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.liquid
@@ -47,14 +47,14 @@ boundaryField
             NRef            30000000;
             deltaTRef       10;
         }
-        departureDiamModel
+        departureDiameterModel
         {
             type            TolubinskiKostanchuk;
             dRef            0.00024;
             dMax            0.0014;
             dMin            1e-06;
         }
-        departureFreqModel
+        departureFrequencyModel
         {
             type            KocamustafaogullariIshii;
             Cf              1.18;
diff --git a/tutorials/modules/CHT/wallBoiling/validation/createGraphs b/tutorials/modules/CHT/wallBoiling/validation/createGraphs
index b613590854..24bebce5b2 100755
--- a/tutorials/modules/CHT/wallBoiling/validation/createGraphs
+++ b/tutorials/modules/CHT/wallBoiling/validation/createGraphs
@@ -50,7 +50,7 @@ gnuplot<<EOF
         './postProcessing/fluid/outflow/$surfaceFile' \
         every ::10::20000 u 1:(360*\$3) w l lt 3 t 'liquid outflow', \
         './postProcessing/fluid/outflow/$surfaceFile' \
-        every ::10::20000 u 1:(360*\$2+360*\$3) w l lt 4 t 'liquid + vapor outflow'
+        every ::10::20000 u 1:(360*\$2+360*\$3) w l lt 4 t 'liquid + vapour outflow'
 
     set ylabel 'Enthalpy in- and outflow (J/s)'
     set yrange [1.5e5:2.0e5]
@@ -64,7 +64,7 @@ gnuplot<<EOF
         "<paste \
         ./postProcessing/fluid/outletLiquid/$surfaceFile \
         ./postProcessing/fluid/outletGas/$surfaceFile" \
-        every ::10::20000 u 1:(360*\$2+360*\$4) w l lt 4 t 'liquid + vapor outflow'
+        every ::10::20000 u 1:(360*\$2+360*\$4) w l lt 4 t 'liquid + vapour outflow'
 
     unset multiplot
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Ar.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Ar.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Ar.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Ar.vapour.orig
index d67b437511..9583b3f6e6 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Ar.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Ar.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      Ar.vapor;
+    object      Ar.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiO2.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Cl2.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiO2.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Cl2.vapour.orig
index 94fad0693f..7e45f6eb2e 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiO2.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Cl2.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      TiO2.vapor;
+    object      Cl2.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Cl2.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/N2.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Cl2.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/N2.vapour.orig
index 4bde9a5624..8fb73fdc5d 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/Cl2.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/N2.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      Cl2.vapor;
+    object      N2.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/O2.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/O2.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/O2.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/O2.vapour.orig
index 2c7002708e..cd57d47a5f 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/O2.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/O2.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      O2.vapor;
+    object      O2.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/T.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/T.vapour
similarity index 98%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/T.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/T.vapour
index 681df9dab3..862883e67a 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/T.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/T.vapour
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      T.vapor;
+    object      T.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiCl4.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiCl4.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiCl4.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiCl4.vapour.orig
index 932a1cda48..b2b26a904c 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiCl4.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiCl4.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      TiCl4.vapor;
+    object      TiCl4.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/N2.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiO2.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/N2.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiO2.vapour.orig
index 138b62fabf..6c92605ee2 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/N2.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/TiO2.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      N2.vapor;
+    object      TiO2.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/U.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/U.vapour
similarity index 94%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/U.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/U.vapour
index 22cecf2433..106d06fdd0 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/U.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/U.vapour
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volVectorField;
-    object      U.vapor;
+    object      U.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -25,7 +25,7 @@ boundaryField
     {
         type            flowRateInletVelocity;
         massFlowRate    2.173893e-07;
-        rho             rho.vapor;
+        rho             rho.vapour;
         profile         laminarBL;
         value           $internalField;
     }
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/alpha.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/alpha.vapour.orig
similarity index 100%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/alpha.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/0/alpha.vapour.orig
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/p_rgh b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/p_rgh
index 7f6fa64432..d5d3bf12da 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/p_rgh
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/p_rgh
@@ -30,9 +30,9 @@ boundaryField
     outlet
     {
         type            prghTotalPressure;
-        U               U.vapor;
-        phi             phi.vapor;
-        rho             rho.vapor;
+        U               U.vapour;
+        phi             phi.vapour;
+        rho             rho.vapour;
         p0              uniform 1e5;
         value           $internalField;
     }
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/chemistryProperties.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/chemistryProperties.vapour
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/chemistryProperties.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/chemistryProperties.vapour
index bb5f78f26e..165bbf3e32 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/chemistryProperties.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/chemistryProperties.vapour
@@ -35,6 +35,6 @@ odeCoeffs
     relTol      0.01;
 }
 
-#include "reactions.vapor"
+#include "reactions.vapour"
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/combustionProperties.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/combustionProperties.vapour
similarity index 93%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/combustionProperties.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/combustionProperties.vapour
index 192769bd79..e1f5d5178e 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/combustionProperties.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/combustionProperties.vapour
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      combustionProperties.vapor;
+    object      combustionProperties.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/momentumTransport.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/momentumTransport.vapour
similarity index 94%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/momentumTransport.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/momentumTransport.vapour
index cdf324c1d0..a86fa6c6cd 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/momentumTransport.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/momentumTransport.vapour
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      momentumTransport.vapor;
+    object      momentumTransport.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/phaseProperties b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/phaseProperties
index 136ff3c3f6..85b379561b 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/phaseProperties
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/phaseProperties
@@ -16,7 +16,7 @@ FoamFile
 
 type populationBalanceMultiphaseSystem;
 
-phases (particles vapor);
+phases (particles vapour);
 
 populationBalances (aggregates);
 
@@ -82,7 +82,7 @@ particles
     residualAlpha   1e-15;
 }
 
-vapor
+vapour
 {
     type            reactingPhaseModel;
 
@@ -95,7 +95,7 @@ populationBalanceCoeffs
 {
     aggregates
     {
-        continuousPhase vapor;
+        continuousPhase vapour;
 
         coalescenceModels
         (
@@ -120,7 +120,7 @@ populationBalanceCoeffs
             {
                 nucleationDiameter  4E-10;
                 velocityGroup       particles;
-                reactingPhase       vapor;
+                reactingPhase       vapour;
                 dmdtf               phaseTransfer:dmidtf;
                 specie              TiO2;
             }
@@ -133,7 +133,7 @@ blending
     default
     {
         type            continuous;
-        phase           vapor;
+        phase           vapour;
     }
 }
 
@@ -145,7 +145,7 @@ surfaceTension
 
 drag
 {
-    particles_dispersedIn_vapor
+    particles_dispersedIn_vapour
     {
         type            timeScaleFiltered;
         minRelaxTime    1e-4;
@@ -162,7 +162,7 @@ virtualMass
 
 heatTransfer
 {
-    particles_dispersedIn_vapor
+    particles_dispersedIn_vapour
     {
         type            timeScaleFiltered;
         minRelaxTime    1e-4;
@@ -177,10 +177,10 @@ heatTransfer
 
 phaseTransfer
 {
-    particles_dispersedIn_vapor
+    particles_dispersedIn_vapour
     {
         type reactionDriven;
-        reactingPhase vapor;
+        reactingPhase vapour;
         targetPhase particles;
         species (TiO2);
     }
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/physicalProperties.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/physicalProperties.vapour
similarity index 91%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/physicalProperties.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/physicalProperties.vapour
index 1c5b38a15a..14c40abc17 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/physicalProperties.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/physicalProperties.vapour
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      physicalProperties.vapor;
+    object      physicalProperties.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -27,7 +27,7 @@ thermoType
 
 defaultSpecie Ar;
 
-#include "$FOAM_CASE/constant/thermo.vapor"
+#include "$FOAM_CASE/constant/thermo.vapour"
 
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/reactions.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/reactions.vapour
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/reactions.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/reactions.vapour
index 90d641a7cc..eba14b9a47 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/reactions.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/reactions.vapour
@@ -16,7 +16,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      reactions.vapor;
+    object      reactions.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/thermo.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/thermo.vapour
similarity index 99%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/thermo.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/thermo.vapour
index 10ecabbabc..6881ac686d 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/thermo.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/thermo.vapour
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      thermo.vapor;
+    object      thermo.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict b/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict
index eb76715575..0e4c462dff 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict
@@ -59,7 +59,7 @@ functions
         funcName=graph,
         start=(0 0 1e-3),
         end=(0.44 0 1e-3),
-        fields=(TiCl4.vapor O2.vapor Cl2.vapor alpha.particles)
+        fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles)
     )
 
     #includeFunc populationBalanceSizeDistribution
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ar.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ar.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ar.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ar.vapour.orig
index 727b165c32..5485c30a5e 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ar.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ar.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      Ar.vapor;
+    object      Ar.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/O2.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/O2.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/0/O2.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/O2.vapour.orig
index 2c7002708e..cd57d47a5f 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/0/O2.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/O2.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      O2.vapor;
+    object      O2.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/T.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/T.vapour
similarity index 98%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/T.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/T.vapour
index 681df9dab3..862883e67a 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/T.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/T.vapour
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      T.vapor;
+    object      T.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/TiCl4.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/TiCl4.vapour.orig
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/TiCl4.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/TiCl4.vapour.orig
index 932a1cda48..b2b26a904c 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/TiCl4.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/TiCl4.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      TiCl4.vapor;
+    object      TiCl4.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/U.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/U.vapour
similarity index 94%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/U.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/U.vapour
index 22cecf2433..106d06fdd0 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/U.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/U.vapour
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volVectorField;
-    object      U.vapor;
+    object      U.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -25,7 +25,7 @@ boundaryField
     {
         type            flowRateInletVelocity;
         massFlowRate    2.173893e-07;
-        rho             rho.vapor;
+        rho             rho.vapour;
         profile         laminarBL;
         value           $internalField;
     }
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ydefault.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ydefault.vapour.orig
similarity index 96%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ydefault.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ydefault.vapour.orig
index eb337a6594..674e4724ee 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ydefault.vapor.orig
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/Ydefault.vapour.orig
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    object      Ydefault.vapor;
+    object      Ydefault.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/alpha.vapor.orig b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/alpha.vapour.orig
similarity index 100%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/alpha.vapor.orig
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/alpha.vapour.orig
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/p_rgh b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/p_rgh
index 7f6fa64432..d5d3bf12da 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/p_rgh
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/0/p_rgh
@@ -30,9 +30,9 @@ boundaryField
     outlet
     {
         type            prghTotalPressure;
-        U               U.vapor;
-        phi             phi.vapor;
-        rho             rho.vapor;
+        U               U.vapour;
+        phi             phi.vapour;
+        rho             rho.vapour;
         p0              uniform 1e5;
         value           $internalField;
     }
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/chemistryProperties.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/chemistryProperties.vapour
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/chemistryProperties.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/chemistryProperties.vapour
index bb5f78f26e..165bbf3e32 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/chemistryProperties.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/chemistryProperties.vapour
@@ -35,6 +35,6 @@ odeCoeffs
     relTol      0.01;
 }
 
-#include "reactions.vapor"
+#include "reactions.vapour"
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/combustionProperties.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/combustionProperties.vapour
similarity index 93%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/combustionProperties.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/combustionProperties.vapour
index 192769bd79..e1f5d5178e 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/combustionProperties.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/combustionProperties.vapour
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      combustionProperties.vapor;
+    object      combustionProperties.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/momentumTransport.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/momentumTransport.vapour
similarity index 94%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/momentumTransport.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/momentumTransport.vapour
index cdf324c1d0..a86fa6c6cd 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/momentumTransport.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/momentumTransport.vapour
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      momentumTransport.vapor;
+    object      momentumTransport.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/phaseProperties b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/phaseProperties
index 9bb5586e77..9177aad1f8 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/phaseProperties
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/phaseProperties
@@ -16,7 +16,7 @@ FoamFile
 
 type populationBalanceMultiphaseSystem;
 
-phases (particles vapor);
+phases (particles vapour);
 
 populationBalances (aggregates);
 
@@ -84,7 +84,7 @@ particles
     residualAlpha   1e-15;
 }
 
-vapor
+vapour
 {
     type            reactingPhaseModel;
 
@@ -99,7 +99,7 @@ populationBalanceCoeffs
 {
     aggregates
     {
-        continuousPhase vapor;
+        continuousPhase vapour;
 
         coalescenceModels
         (
@@ -119,7 +119,7 @@ populationBalanceCoeffs
         (
             phaseChange
             {
-                interfaces          (particles_vapor);
+                interfaces          (particles_vapour);
                 dmdtf               phaseTransfer:dmidtf;
                 specie              TiO2_s;
                 surfaceGrowthType   ParkRogak;
@@ -132,7 +132,7 @@ populationBalanceCoeffs
             {
                 nucleationDiameter  4E-10;
                 velocityGroup       particles;
-                reactingPhase       vapor;
+                reactingPhase       vapour;
                 dmdtf               phaseTransfer:dmidtf;
                 specie              TiO2;
             }
@@ -145,7 +145,7 @@ blending
     default
     {
         type            continuous;
-        phase           vapor;
+        phase           vapour;
     }
 }
 
@@ -157,7 +157,7 @@ surfaceTension
 
 drag
 {
-    particles_dispersedIn_vapor
+    particles_dispersedIn_vapour
     {
         type            timeScaleFiltered;
         minRelaxTime    1e-4;
@@ -174,7 +174,7 @@ virtualMass
 
 heatTransfer
 {
-    particles_dispersedIn_vapor
+    particles_dispersedIn_vapour
     {
         type            timeScaleFiltered;
         minRelaxTime    1e-4;
@@ -189,10 +189,10 @@ heatTransfer
 
 phaseTransfer
 {
-    particles_dispersedIn_vapor
+    particles_dispersedIn_vapour
     {
         type reactionDriven;
-        reactingPhase vapor;
+        reactingPhase vapour;
         targetPhase particles;
         species (TiO2 TiO2_s);
     }
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/physicalProperties.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/physicalProperties.vapour
similarity index 91%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/physicalProperties.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/physicalProperties.vapour
index 1c5b38a15a..14c40abc17 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/constant/physicalProperties.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/physicalProperties.vapour
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      physicalProperties.vapor;
+    object      physicalProperties.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -27,7 +27,7 @@ thermoType
 
 defaultSpecie Ar;
 
-#include "$FOAM_CASE/constant/thermo.vapor"
+#include "$FOAM_CASE/constant/thermo.vapour"
 
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/reactions.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/reactions.vapour
similarity index 97%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/reactions.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/reactions.vapour
index e9ecfda97d..75fa7e978e 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/reactions.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/reactions.vapour
@@ -20,7 +20,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      reactions.vapor;
+    object      reactions.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/thermo.vapor b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/thermo.vapour
similarity index 99%
rename from tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/thermo.vapor
rename to tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/thermo.vapour
index e39196fd2b..3ff7b38ce9 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/thermo.vapor
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/constant/thermo.vapour
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      thermo.vapor;
+    object      thermo.vapour;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict
index c0da3444eb..d01b956dda 100644
--- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict
+++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict
@@ -59,7 +59,7 @@ functions
         funcName=graph,
         start=(0 0 1e-3),
         end=(0.44 0 1e-3),
-        fields=(TiCl4.vapor O2.vapor Cl2.vapor alpha.particles)
+        fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles)
     )
 
     #includeFunc populationBalanceSizeDistribution
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/alphat.gas b/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/alphat.gas
index 3fbb4b5bab..53583597e1 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/alphat.gas
+++ b/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/alphat.gas
@@ -34,7 +34,7 @@ boundaryField
     {
         type            compressible::alphatWallBoilingWallFunction;
         otherPhase      liquid;
-        phaseType       vapor;
+        phaseType       vapour;
         Prt             0.85;
         partitioningModel
         {
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/alphat.liquid b/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/alphat.liquid
index ddbb10e0ee..69768e86bd 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/alphat.liquid
+++ b/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/alphat.liquid
@@ -48,14 +48,14 @@ boundaryField
             NRef            30000000;
             deltaTRef       10;
         }
-        departureDiamModel
+        departureDiameterModel
         {
             type            TolubinskiKostanchuk;
             dRef            0.00024;
             dMax            0.0014;
             dMin            1e-06;
         }
-        departureFreqModel
+        departureFrequencyModel
         {
             type            KocamustafaogullariIshii;
             Cf              1.18;
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingIATE/validation/createGraphs b/tutorials/modules/multiphaseEuler/wallBoilingIATE/validation/createGraphs
index dcfceca79e..227b685195 100755
--- a/tutorials/modules/multiphaseEuler/wallBoilingIATE/validation/createGraphs
+++ b/tutorials/modules/multiphaseEuler/wallBoilingIATE/validation/createGraphs
@@ -57,7 +57,7 @@ gnuplot<<EOF
         './postProcessing/outflow/$surfaceFile' \
         every ::4::10000 u 1:(360*\$3) w l lt 3 t 'liquid outflow', \
         './postProcessing/outflow/$surfaceFile' \
-        every ::4::10000 u 1:(360*\$2+360*\$3) w l lt 4 t 'liquid + vapor outflow'
+        every ::4::10000 u 1:(360*\$2+360*\$3) w l lt 4 t 'liquid + vapour outflow'
 
     set ylabel 'Enthalpy in- and outflow (J/s)'
     set yrange [1.5e5:2.0e5]
@@ -71,7 +71,7 @@ gnuplot<<EOF
         "<paste \
         ./postProcessing/outletLiquid/$surfaceFile \
         ./postProcessing/outletGas/$surfaceFile" \
-        every ::4::10000 u 1:(360*\$2+360*\$4) w l lt 4 t 'liquid + vapor outflow'
+        every ::4::10000 u 1:(360*\$2+360*\$4) w l lt 4 t 'liquid + vapour outflow'
 
     unset multiplot
 
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/alphat.gas b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/alphat.gas
index 3fbb4b5bab..53583597e1 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/alphat.gas
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/alphat.gas
@@ -34,7 +34,7 @@ boundaryField
     {
         type            compressible::alphatWallBoilingWallFunction;
         otherPhase      liquid;
-        phaseType       vapor;
+        phaseType       vapour;
         Prt             0.85;
         partitioningModel
         {
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/alphat.liquid b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/alphat.liquid
index ddbb10e0ee..69768e86bd 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/alphat.liquid
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/alphat.liquid
@@ -48,14 +48,14 @@ boundaryField
             NRef            30000000;
             deltaTRef       10;
         }
-        departureDiamModel
+        departureDiameterModel
         {
             type            TolubinskiKostanchuk;
             dRef            0.00024;
             dMax            0.0014;
             dMin            1e-06;
         }
-        departureFreqModel
+        departureFrequencyModel
         {
             type            KocamustafaogullariIshii;
             Cf              1.18;
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/validation/createGraphs b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/validation/createGraphs
index dcfceca79e..227b685195 100755
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/validation/createGraphs
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/validation/createGraphs
@@ -57,7 +57,7 @@ gnuplot<<EOF
         './postProcessing/outflow/$surfaceFile' \
         every ::4::10000 u 1:(360*\$3) w l lt 3 t 'liquid outflow', \
         './postProcessing/outflow/$surfaceFile' \
-        every ::4::10000 u 1:(360*\$2+360*\$3) w l lt 4 t 'liquid + vapor outflow'
+        every ::4::10000 u 1:(360*\$2+360*\$3) w l lt 4 t 'liquid + vapour outflow'
 
     set ylabel 'Enthalpy in- and outflow (J/s)'
     set yrange [1.5e5:2.0e5]
@@ -71,7 +71,7 @@ gnuplot<<EOF
         "<paste \
         ./postProcessing/outletLiquid/$surfaceFile \
         ./postProcessing/outletGas/$surfaceFile" \
-        every ::4::10000 u 1:(360*\$2+360*\$4) w l lt 4 t 'liquid + vapor outflow'
+        every ::4::10000 u 1:(360*\$2+360*\$4) w l lt 4 t 'liquid + vapour outflow'
 
     unset multiplot
 
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.gas b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.gas
index 3fbb4b5bab..53583597e1 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.gas
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.gas
@@ -34,7 +34,7 @@ boundaryField
     {
         type            compressible::alphatWallBoilingWallFunction;
         otherPhase      liquid;
-        phaseType       vapor;
+        phaseType       vapour;
         Prt             0.85;
         partitioningModel
         {
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.gas2 b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.gas2
index 3fbb4b5bab..53583597e1 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.gas2
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.gas2
@@ -34,7 +34,7 @@ boundaryField
     {
         type            compressible::alphatWallBoilingWallFunction;
         otherPhase      liquid;
-        phaseType       vapor;
+        phaseType       vapour;
         Prt             0.85;
         partitioningModel
         {
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.liquid b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.liquid
index ddbb10e0ee..69768e86bd 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.liquid
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/alphat.liquid
@@ -48,14 +48,14 @@ boundaryField
             NRef            30000000;
             deltaTRef       10;
         }
-        departureDiamModel
+        departureDiameterModel
         {
             type            TolubinskiKostanchuk;
             dRef            0.00024;
             dMax            0.0014;
             dMin            1e-06;
         }
-        departureFreqModel
+        departureFrequencyModel
         {
             type            KocamustafaogullariIshii;
             Cf              1.18;
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createGraphs b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createGraphs
index 82a2a0364a..c758cad835 100755
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createGraphs
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createGraphs
@@ -57,7 +57,7 @@ gnuplot<<EOF
         './postProcessing/outflow/$surfaceFile' \
         every ::4::10000 u 1:(360*\$4) w l lt 3 t 'liquid outflow', \
         './postProcessing/outflow/$surfaceFile' \
-        every ::4::10000 u 1:(360*\$2+360*\$3+360*\$4) w l lt 4 t 'liquid + vapor outflow'
+        every ::4::10000 u 1:(360*\$2+360*\$3+360*\$4) w l lt 4 t 'liquid + vapour outflow'
 
     set ylabel 'Enthalpy in- and outflow (J/s)'
     set yrange [1.5e5:2.0e5]
@@ -72,7 +72,7 @@ gnuplot<<EOF
         ./postProcessing/outletLiquid/$surfaceFile \
         ./postProcessing/outletGas/$surfaceFile \
         ./postProcessing/outletGas2/$surfaceFile" \
-        every ::4::10000 u 1:(360*\$2+360*\$4+360*\$6) w l lt 4 t 'liquid + vapor outflow'
+        every ::4::10000 u 1:(360*\$2+360*\$4+360*\$6) w l lt 4 t 'liquid + vapour outflow'
 
     unset multiplot