diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files
index 322d6c83d0..ef3380c78d 100644
--- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files
+++ b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files
@@ -25,6 +25,6 @@ derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunction
 derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C
 derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
 derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
-derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
+derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libmultiphaseThermophysicalTransportModels
diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.C
similarity index 80%
rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
rename to applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.C
index 4f0d85405b..0734ddd859 100644
--- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
+++ b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "fixedMultiPhaseHeatFluxFvPatchScalarField.H"
+#include "fixedMultiphaseHeatFluxFvPatchScalarField.H"
 #include "fvPatchFieldMapper.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -33,8 +33,8 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
-fixedMultiPhaseHeatFluxFvPatchScalarField
+Foam::fixedMultiphaseHeatFluxFvPatchScalarField::
+fixedMultiphaseHeatFluxFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -47,8 +47,8 @@ fixedMultiPhaseHeatFluxFvPatchScalarField
 {}
 
 
-Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
-fixedMultiPhaseHeatFluxFvPatchScalarField
+Foam::fixedMultiphaseHeatFluxFvPatchScalarField::
+fixedMultiphaseHeatFluxFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -62,10 +62,10 @@ fixedMultiPhaseHeatFluxFvPatchScalarField
 {}
 
 
-Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
-fixedMultiPhaseHeatFluxFvPatchScalarField
+Foam::fixedMultiphaseHeatFluxFvPatchScalarField::
+fixedMultiphaseHeatFluxFvPatchScalarField
 (
-    const fixedMultiPhaseHeatFluxFvPatchScalarField& psf,
+    const fixedMultiphaseHeatFluxFvPatchScalarField& psf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -78,10 +78,10 @@ fixedMultiPhaseHeatFluxFvPatchScalarField
 {}
 
 
-Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
-fixedMultiPhaseHeatFluxFvPatchScalarField
+Foam::fixedMultiphaseHeatFluxFvPatchScalarField::
+fixedMultiphaseHeatFluxFvPatchScalarField
 (
-    const fixedMultiPhaseHeatFluxFvPatchScalarField& psf,
+    const fixedMultiphaseHeatFluxFvPatchScalarField& psf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -95,7 +95,7 @@ fixedMultiPhaseHeatFluxFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::updateCoeffs()
+void Foam::fixedMultiphaseHeatFluxFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -151,7 +151,7 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::updateCoeffs()
 }
 
 
-void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::autoMap
+void Foam::fixedMultiphaseHeatFluxFvPatchScalarField::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -161,7 +161,7 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::autoMap
 }
 
 
-void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::rmap
+void Foam::fixedMultiphaseHeatFluxFvPatchScalarField::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
@@ -169,28 +169,28 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::rmap
 {
     fixedValueFvPatchScalarField::rmap(ptf, addr);
 
-    const fixedMultiPhaseHeatFluxFvPatchScalarField& mptf =
-        refCast<const fixedMultiPhaseHeatFluxFvPatchScalarField>(ptf);
+    const fixedMultiphaseHeatFluxFvPatchScalarField& mptf =
+        refCast<const fixedMultiphaseHeatFluxFvPatchScalarField>(ptf);
 
     q_.rmap(mptf.q_, addr);
 }
 
 
-void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::reset
+void Foam::fixedMultiphaseHeatFluxFvPatchScalarField::reset
 (
     const fvPatchScalarField& ptf
 )
 {
     fixedValueFvPatchScalarField::reset(ptf);
 
-    const fixedMultiPhaseHeatFluxFvPatchScalarField& mptf =
-        refCast<const fixedMultiPhaseHeatFluxFvPatchScalarField>(ptf);
+    const fixedMultiphaseHeatFluxFvPatchScalarField& mptf =
+        refCast<const fixedMultiphaseHeatFluxFvPatchScalarField>(ptf);
 
     q_.reset(mptf.q_);
 }
 
 
-void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::write(Ostream& os) const
+void Foam::fixedMultiphaseHeatFluxFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeEntry(os, "relax", relax_);
@@ -206,7 +206,7 @@ namespace Foam
     makePatchTypeField
     (
         fvPatchScalarField,
-        fixedMultiPhaseHeatFluxFvPatchScalarField
+        fixedMultiphaseHeatFluxFvPatchScalarField
     );
 }
 
diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.H
similarity index 82%
rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H
rename to applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.H
index 6dfa23faa8..f2b4aeb48a 100644
--- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H
+++ b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::fixedMultiPhaseHeatFluxFvPatchScalarField
+    Foam::fixedMultiphaseHeatFluxFvPatchScalarField
 
 Description
     Calculates a wall temperature that produces the specified overall wall heat
@@ -30,19 +30,19 @@ Description
 
     Intended to be used with copiedFixedValue to ensure that phase wall
     temperature are consistent:
-        - Set 'fixedMultiPhaseHeatFlux' boundary for one of the phases
+        - Set 'fixedMultiphaseHeatFlux' boundary for one of the phases
         - Use 'copiedFixedValue' for all the other phases.
 
 See also
     Foam::fixedValueFvPatchField
 
 SourceFiles
-    fixedMultiPhaseHeatFluxFvPatchScalarField.C
+    fixedMultiphaseHeatFluxFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedMultiPhaseHeatFluxFvPatchScalarField_H
-#define fixedMultiPhaseHeatFluxFvPatchScalarField_H
+#ifndef fixedMultiphaseHeatFluxFvPatchScalarField_H
+#define fixedMultiphaseHeatFluxFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -52,10 +52,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-          Class fixedMultiPhaseHeatFluxFvPatchScalarField Declaration
+          Class fixedMultiphaseHeatFluxFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class fixedMultiPhaseHeatFluxFvPatchScalarField
+class fixedMultiphaseHeatFluxFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -74,20 +74,20 @@ class fixedMultiPhaseHeatFluxFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("fixedMultiPhaseHeatFlux");
+    TypeName("fixedMultiphaseHeatFlux");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        fixedMultiPhaseHeatFluxFvPatchScalarField
+        fixedMultiphaseHeatFluxFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        fixedMultiPhaseHeatFluxFvPatchScalarField
+        fixedMultiphaseHeatFluxFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -95,26 +95,26 @@ public:
         );
 
         //- Construct by mapping given
-        //  fixedMultiPhaseHeatFluxFvPatchScalarField
+        //  fixedMultiphaseHeatFluxFvPatchScalarField
         //  onto a new patch
-        fixedMultiPhaseHeatFluxFvPatchScalarField
+        fixedMultiphaseHeatFluxFvPatchScalarField
         (
-            const fixedMultiPhaseHeatFluxFvPatchScalarField&,
+            const fixedMultiphaseHeatFluxFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Disallow copy without setting internal field reference
-        fixedMultiPhaseHeatFluxFvPatchScalarField
+        fixedMultiphaseHeatFluxFvPatchScalarField
         (
-            const fixedMultiPhaseHeatFluxFvPatchScalarField&
+            const fixedMultiphaseHeatFluxFvPatchScalarField&
         ) = delete;
 
         //- Copy constructor setting internal field reference
-        fixedMultiPhaseHeatFluxFvPatchScalarField
+        fixedMultiphaseHeatFluxFvPatchScalarField
         (
-            const fixedMultiPhaseHeatFluxFvPatchScalarField&,
+            const fixedMultiphaseHeatFluxFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -126,7 +126,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new fixedMultiPhaseHeatFluxFvPatchScalarField(*this, iF)
+                new fixedMultiphaseHeatFluxFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/T.liquid b/tutorials/modules/multiphaseEuler/wallBoiling/0/T.liquid
index ffe1c8bff4..05ce63a7b9 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/T.liquid
+++ b/tutorials/modules/multiphaseEuler/wallBoiling/0/T.liquid
@@ -34,7 +34,7 @@ boundaryField
     }
     wall
     {
-        type            fixedMultiPhaseHeatFlux;
+        type            fixedMultiphaseHeatFlux;
         relax           0.6;
         q               uniform 0;
         phase           "liquid";
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/T.liquid b/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/T.liquid
index ffe1c8bff4..05ce63a7b9 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/T.liquid
+++ b/tutorials/modules/multiphaseEuler/wallBoilingIATE/0/T.liquid
@@ -34,7 +34,7 @@ boundaryField
     }
     wall
     {
-        type            fixedMultiPhaseHeatFlux;
+        type            fixedMultiphaseHeatFlux;
         relax           0.6;
         q               uniform 0;
         phase           "liquid";
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/T.liquid b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/T.liquid
index ffe1c8bff4..05ce63a7b9 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/T.liquid
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/0/T.liquid
@@ -34,7 +34,7 @@ boundaryField
     }
     wall
     {
-        type            fixedMultiPhaseHeatFlux;
+        type            fixedMultiphaseHeatFlux;
         relax           0.6;
         q               uniform 0;
         phase           "liquid";
diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/T.liquid b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/T.liquid
index ffe1c8bff4..05ce63a7b9 100644
--- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/T.liquid
+++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/0/T.liquid
@@ -34,7 +34,7 @@ boundaryField
     }
     wall
     {
-        type            fixedMultiPhaseHeatFlux;
+        type            fixedMultiphaseHeatFlux;
         relax           0.6;
         q               uniform 0;
         phase           "liquid";