diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C
index c6b330cd1b..116cfd92ca 100644
--- a/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C
+++ b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C
@@ -144,32 +144,41 @@ void VoFPatchTransfer::correct
     // Do not correct if no patches selected
     if (!patchIDs_.size()) return;
 
+    // Film properties
+
     const thermoSurfaceFilm& film = filmType<thermoSurfaceFilm>();
 
     const scalarField& delta = film.delta();
     const scalarField& rho = film.rho();
+    const vectorField& U = film.U();
+    const scalarField& he = film.thermo().he();
+
     const scalarField& magSf = film.magSf();
 
     const polyBoundaryMesh& pbm = film.mesh().boundaryMesh();
 
 
+    // Primary region properties
+
+    const fvMesh& primaryMesh = film.primaryMesh();
+
     const compressibleTwoPhaseVoFMixture& thermo
     (
-        film.primaryMesh().lookupObject<compressibleTwoPhaseVoFMixture>
+        primaryMesh.lookupObject<compressibleTwoPhaseVoFMixture>
         (
             "phaseProperties"
         )
     );
 
-    const volVectorField& UVoF
-    (
-        film.primaryMesh().lookupObject<volVectorField>("U")
-    );
-
     const volScalarField& alphaVoF = thermo.alpha1();
     const volScalarField& rhoVoF = thermo.thermo1().rho()();
     const volScalarField& heVoF = thermo.thermo1().he();
 
+    const volVectorField& UVoF
+    (
+        primaryMesh.lookupObject<volVectorField>("U")
+    );
+
     forAll(patchIDs_, pidi)
     {
         const label patchi = patchIDs_[pidi];
@@ -192,7 +201,7 @@ void VoFPatchTransfer::correct
                 film.toFilm
                 (
                     patchi,
-                    film.primaryMesh().boundary()[primaryPatchi].deltaCoeffs()
+                    primaryMesh.boundary()[primaryPatchi].deltaCoeffs()
                 )
             );
 
@@ -221,17 +230,14 @@ void VoFPatchTransfer::correct
                 film.toFilm
                 (
                     patchi,
-                    film.primaryMesh().boundary()[primaryPatchi]
-                   .patchInternalField(film.primaryMesh().V())
+                    primaryMesh.boundary()[primaryPatchi]
+                   .patchInternalField(primaryMesh.V())
                 )
             );
 
             const polyPatch& pp = pbm[patchi];
             const labelList& faceCells = pp.faceCells();
 
-            const vectorField& U = film.U();
-            const scalarField& he = film.thermo().he();
-
             // Accumulate the total mass removed from patch
             scalar dMassPatch = 0;
 
diff --git a/applications/solvers/modules/isothermalFilm/contactForce.C b/applications/solvers/modules/isothermalFilm/contactForce.C
index 04d0e0017a..d81ebadae0 100644
--- a/applications/solvers/modules/isothermalFilm/contactForce.C
+++ b/applications/solvers/modules/isothermalFilm/contactForce.C
@@ -72,8 +72,8 @@ Foam::solvers::isothermalFilm::contactForce(const volScalarField& sigma) const
     }
 
     // Filter for film wall and surface patches
-    labelHashSet wallSurfacePatches(wallPatchIDs);
-    wallSurfacePatches.insert(surfacePatchIDs);
+    labelHashSet wallAndSurfacePatches(wallPatchIDs);
+    wallAndSurfacePatches.insert(surfacePatchID);
 
     const volScalarField::Boundary& deltaBf = delta.boundaryField();
 
@@ -82,7 +82,7 @@ Foam::solvers::isothermalFilm::contactForce(const volScalarField& sigma) const
         const fvPatch& p(mesh.boundary()[patchi]);
 
         // For internal coupled patches
-        if (p.coupled() && !wallSurfacePatches.found(patchi))
+        if (p.coupled() && !wallAndSurfacePatches.found(patchi))
         {
             tmp<scalarField> tdeltan = deltaBf[patchi].patchNeighbourField();
             const scalarField& deltan = tdeltan();
diff --git a/applications/solvers/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C b/applications/solvers/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C
index 6b874aedeb..9b1e89502e 100644
--- a/applications/solvers/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C
+++ b/applications/solvers/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C
@@ -129,7 +129,7 @@ void Foam::filmSurfaceVelocityFvPatchVectorField::updateCoeffs()
     );
 
     // Set the reference value to the neighbouring fluid internal velocity
-    refValue() = mpp.distribute(UpNbr);
+    refValue() = mpp.fromNeigbour(UpNbr);
 
     // Remove the normal component of the surface vel
     const vectorField n(patch().nf());
@@ -164,7 +164,7 @@ void Foam::filmSurfaceVelocityFvPatchVectorField::updateCoeffs()
         // Get the patch laminar viscosity
         const tmp<scalarField> nuEffByDeltaNbr
         (
-            mpp.distribute
+            mpp.fromNeigbour
             (
                 transportModelNbr.nuEff(patchiNbr)*patchNbr.deltaCoeffs()
             )
diff --git a/applications/solvers/modules/isothermalFilm/isothermalFilm.C b/applications/solvers/modules/isothermalFilm/isothermalFilm.C
index 06fe7642ac..2c78e85d77 100644
--- a/applications/solvers/modules/isothermalFilm/isothermalFilm.C
+++ b/applications/solvers/modules/isothermalFilm/isothermalFilm.C
@@ -152,10 +152,8 @@ bool Foam::solvers::isothermalFilm::initFilmMesh()
     wallPatchIDs.transfer(wallPatchIDs_);
 
 
-    // Search for film surface patches
-
-    label nSurfaceFaces = 0;
-    DynamicList<label> surfacePatchIDs_;
+    // Search for film surface patch
+    surfacePatchID = -1;
 
     forAll(bm, patchi)
     {
@@ -163,16 +161,23 @@ bool Foam::solvers::isothermalFilm::initFilmMesh()
 
         if (isA<filmSurfacePolyPatch>(p))
         {
-            surfacePatchIDs_.append(patchi);
-            nSurfaceFaces += p.faceCells().size();
+            if (surfacePatchID == -1)
+            {
+                surfacePatchID = patchi;
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "More than one filmSurface patch defined: "
+                    << surfacePatchID << " and " << patchi
+                    << exit(FatalError);
+            }
         }
     }
 
-    surfacePatchIDs.transfer(surfacePatchIDs_);
-
-    if (returnReduce(nSurfaceFaces, sumOp<label>()) == 0)
+    if (surfacePatchID == -1)
     {
-        Info<< "There are no filmSurface faces in the mesh"
+        Info<< "The filmSurface patch is not defined"
             << endl;
     }
 
@@ -215,9 +220,9 @@ Foam::wordList Foam::solvers::isothermalFilm::alphaTypes() const
         alphaTypes[wallPatchIDs[i]] = alphaOneFvPatchScalarField::typeName;
     }
 
-    forAll(surfacePatchIDs, i)
+    if (surfacePatchID != -1)
     {
-        alphaTypes[surfacePatchIDs[i]] = alphaOneFvPatchScalarField::typeName;
+        alphaTypes[surfacePatchID] = alphaOneFvPatchScalarField::typeName;
     }
 
     return alphaTypes;
diff --git a/applications/solvers/modules/isothermalFilm/isothermalFilm.H b/applications/solvers/modules/isothermalFilm/isothermalFilm.H
index 861ad3943b..1ac6ee74ad 100644
--- a/applications/solvers/modules/isothermalFilm/isothermalFilm.H
+++ b/applications/solvers/modules/isothermalFilm/isothermalFilm.H
@@ -107,11 +107,12 @@ protected:
 
     // Film
 
-        //- List film wall patch IDs
+        //- List of film wall patch IDs
         labelList wallPatchIDs;
 
-        //- List of film surface patch IDs
-        labelList surfacePatchIDs;
+        //- Film surface patch ID
+        //  Set to -1 if the surface patch is empty or not coupled
+        label surfacePatchID;
 
         //- Film wall normal
         volVectorField nHat;
diff --git a/applications/solvers/modules/isothermalFilm/isothermalFilmTemplates.C b/applications/solvers/modules/isothermalFilm/isothermalFilmTemplates.C
index 41f45cdc6a..4ea4b2a547 100644
--- a/applications/solvers/modules/isothermalFilm/isothermalFilmTemplates.C
+++ b/applications/solvers/modules/isothermalFilm/isothermalFilmTemplates.C
@@ -37,10 +37,9 @@ void Foam::solvers::isothermalFilm::constrainField
         fieldBf[patchi] = Zero;
     }
 
-    forAll(surfacePatchIDs, i)
+    if (surfacePatchID != -1)
     {
-        const label patchi = surfacePatchIDs[i];
-        fieldBf[patchi] = Zero;
+        fieldBf[surfacePatchID] = Zero;
     }
 }
 
diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C
index 7e24fa3390..d7a5c78d3b 100644
--- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C
@@ -325,7 +325,7 @@ void Foam::coupledTemperatureFvPatchScalarField::updateCoeffs()
 
     if (qrNbrName_ != "none")
     {
-        sumq += mpp.distribute
+        sumq += mpp.fromNeigbour
         (
             patchNbr.lookupPatchField<volScalarField, scalar>(qrNbrName_)
         );
@@ -354,8 +354,8 @@ void Foam::coupledTemperatureFvPatchScalarField::updateCoeffs()
                 qNbr
             );
 
-            add(sumKappaTByDelta, mpp.distribute(sumKappaTByDeltaNbr));
-            add(sumKappaByDelta, mpp.distribute(sumKappaByDeltaNbr));
+            add(sumKappaTByDelta, mpp.fromNeigbour(sumKappaTByDeltaNbr));
+            add(sumKappaByDelta, mpp.fromNeigbour(sumKappaByDeltaNbr));
         }
         else
         {
@@ -364,12 +364,12 @@ void Foam::coupledTemperatureFvPatchScalarField::updateCoeffs()
             coupledTemperatureNbr.getNbr(TwNbr, qNbr);
 
             add(sumKappaByDelta, scalarField(size(), wallKappaByDelta_));
-            add(sumKappaTByDelta, wallKappaByDelta_*mpp.distribute(TwNbr));
+            add(sumKappaTByDelta, wallKappaByDelta_*mpp.fromNeigbour(TwNbr));
         }
 
         if (qNbr.valid())
         {
-            sumq += mpp.distribute(qNbr);
+            sumq += mpp.fromNeigbour(qNbr);
         }
     }
 
diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 9b94e0c77e..19868a70bf 100644
--- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -239,7 +239,7 @@ baffleThickness() const
     else
     {
         const mappedPatchBase& mpp = mappedPatchBase::getMap(patch().patch());
-        return mpp.distribute(nbrField().baffleThickness());
+        return mpp.fromNeigbour(nbrField().baffleThickness());
     }
 }
 
@@ -254,7 +254,7 @@ tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>::qs() const
     else
     {
         const mappedPatchBase& mpp = mappedPatchBase::getMap(patch().patch());
-        return mpp.distribute(nbrField().qs());
+        return mpp.fromNeigbour(nbrField().qs());
     }
 }
 
@@ -348,7 +348,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
         const scalarField kappaDelta(kappap*patch().deltaCoeffs());
 
         // Neighbour properties
-        const scalarField nbrTp(mpp.distribute(nbrField()));
+        const scalarField nbrTp(mpp.fromNeigbour(nbrField()));
 
         // Solid properties
         scalarField kappas(patch().size(), 0.0);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mapped/mappedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mapped/mappedFvPatchField.C
index a3960ec62e..521bb4ce55 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mapped/mappedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mapped/mappedFvPatchField.C
@@ -71,7 +71,7 @@ Foam::mappedFvPatchField<Type>::mappedValues
     UPstream::msgType() = oldTag + 1;
 
     // Map values
-    tmp<Field<Type>> tResult = this->mapper().distribute(nbrPatchField);
+    tmp<Field<Type>> tResult = this->mapper().fromNeigbour(nbrPatchField);
 
     // Set the average, if necessary
     if (setAverage_)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C
index 6577aaa58b..a76c4cc487 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C
@@ -123,7 +123,7 @@ void Foam::mappedFlowRateVelocityFvPatchVectorField::updateCoeffs()
 
     const scalarField phip
     (
-        mapper.distribute
+        mapper.fromNeigbour
         (
             nbrPatch.lookupPatchField<surfaceScalarField, scalar>(nbrPhiName_)
         )
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.C
index 1b052e0828..f1af1f5cd6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.C
@@ -110,9 +110,9 @@ void Foam::mappedVelocityFluxFvPatchField::updateCoeffs()
     surfaceScalarField& phiField =
         nbrMesh.lookupObjectRef<surfaceScalarField>(phiName_);
 
-    operator==(mapper.distribute(UField.boundaryField()[nbrPatchi]));
+    operator==(mapper.fromNeigbour(UField.boundaryField()[nbrPatchi]));
     phiField.boundaryFieldRef()[patch().index()] ==
-        mapper.distribute(phiField.boundaryField()[nbrPatchi]);
+        mapper.fromNeigbour(phiField.boundaryField()[nbrPatchi]);
 
     // Restore tag
     UPstream::msgType() = oldTag;
diff --git a/src/meshTools/mappedPatches/mappedExtrudedPatchBase/mappedExtrudedPatchBase.C b/src/meshTools/mappedPatches/mappedExtrudedPatchBase/mappedExtrudedPatchBase.C
index c873c7d374..369380d1c9 100644
--- a/src/meshTools/mappedPatches/mappedExtrudedPatchBase/mappedExtrudedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedExtrudedPatchBase/mappedExtrudedPatchBase.C
@@ -121,14 +121,14 @@ Foam::mappedExtrudedPatchBase::patchFaceAreas() const
 
             bottomFaceAreasPtr_.set
             (
-                nbrPp.reverseDistribute
+                nbrPp.toNeigbour
                 (
                     nbrPp.patch_.primitivePatch::faceAreas()
                 ).ptr()
             );
             bottomFaceCentresPtr_.set
             (
-                nbrPp.reverseDistribute
+                nbrPp.toNeigbour
                 (
                     nbrPp.patch_.primitivePatch::faceCentres()
                 ).ptr()
diff --git a/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBase.H
index 0e6f7b39c9..7237f01b19 100644
--- a/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBase.H
+++ b/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBase.H
@@ -249,21 +249,21 @@ public:
 
         // Distribute
 
-            //- Wrapper around map/interpolate data distribution
+            //- Map/interpolate the neighbour patch field to this patch
             template<class Type>
-            tmp<Field<Type>> distribute(const Field<Type>& fld) const;
+            tmp<Field<Type>> fromNeigbour(const Field<Type>& nbrFld) const;
 
-            //- Wrapper around map/interpolate data distribution
+            //- Map/interpolate the neighbour patch field to this patch
             template<class Type>
-            tmp<Field<Type>> distribute(const tmp<Field<Type>>& fld) const;
+            tmp<Field<Type>> fromNeigbour(const tmp<Field<Type>>& nbrFld) const;
 
-            //- Wrapper around map/interpolate data distribution
+            //- Map/interpolate patch field to the neighbour patch
             template<class Type>
-            tmp<Field<Type>> reverseDistribute(const Field<Type>& fld) const;
+            tmp<Field<Type>> toNeigbour(const Field<Type>& fld) const;
 
-            //- Wrapper around map/interpolate data distribution
+            //- Map/interpolate patch field to the neighbour patch
             template<class Type>
-            tmp<Field<Type>> reverseDistribute
+            tmp<Field<Type>> toNeigbour
             (
                 const tmp<Field<Type>>& fld
             ) const;
diff --git a/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBaseTemplates.C b/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBaseTemplates.C
index bd246f7655..2c3031888b 100644
--- a/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBaseTemplates.C
+++ b/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBaseTemplates.C
@@ -106,11 +106,11 @@ void Foam::mappedPatchBase::validateForField
 
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
-Foam::mappedPatchBase::distribute(const Field<Type>& fld) const
+Foam::mappedPatchBase::fromNeigbour(const Field<Type>& nbrFld) const
 {
     if (sameUntransformedPatch())
     {
-        return fld;
+        return nbrFld;
     }
 
     if (!patchToPatchIsUsed_)
@@ -120,7 +120,7 @@ Foam::mappedPatchBase::distribute(const Field<Type>& fld) const
             calcMapping();
         }
 
-        tmp<Field<Type>> tResult(new Field<Type>(fld, nbrPatchFaceIndices_));
+        tmp<Field<Type>> tResult(new Field<Type>(nbrFld, nbrPatchFaceIndices_));
         mapPtr_->distribute(tResult.ref());
         return transform_.transform().transform(tResult);
     }
@@ -144,8 +144,8 @@ Foam::mappedPatchBase::distribute(const Field<Type>& fld) const
             transform_.transform().transform
             (
                 patchToPatchIsValid_
-              ? patchToPatchPtr_->tgtToSrc(fld)
-              : nbrMappedPatch().patchToPatchPtr_->srcToTgt(fld)
+              ? patchToPatchPtr_->tgtToSrc(nbrFld)
+              : nbrMappedPatch().patchToPatchPtr_->srcToTgt(nbrFld)
             );
     }
 }
@@ -153,17 +153,17 @@ Foam::mappedPatchBase::distribute(const Field<Type>& fld) const
 
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
-Foam::mappedPatchBase::distribute(const tmp<Field<Type>>& fld) const
+Foam::mappedPatchBase::fromNeigbour(const tmp<Field<Type>>& nbrFld) const
 {
-    tmp<Field<Type>> tResult = distribute(fld());
-    fld.clear();
+    tmp<Field<Type>> tResult = fromNeigbour(nbrFld());
+    nbrFld.clear();
     return tResult;
 }
 
 
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
-Foam::mappedPatchBase::reverseDistribute(const Field<Type>& fld) const
+Foam::mappedPatchBase::toNeigbour(const Field<Type>& fld) const
 {
     if (sameUntransformedPatch())
     {
@@ -207,9 +207,9 @@ Foam::mappedPatchBase::reverseDistribute(const Field<Type>& fld) const
 
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
-Foam::mappedPatchBase::reverseDistribute(const tmp<Field<Type>>& fld) const
+Foam::mappedPatchBase::toNeigbour(const tmp<Field<Type>>& fld) const
 {
-    tmp<Field<Type>> tResult = reverseDistribute(fld());
+    tmp<Field<Type>> tResult = toNeigbour(fld());
     fld.clear();
     return tResult;
 }
diff --git a/src/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C b/src/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
index 4676f28cc3..e8948fc07b 100644
--- a/src/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
+++ b/src/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
@@ -146,7 +146,7 @@ Foam::tmp<Foam::scalarField> Foam::radiationCoupledBase::emissivity() const
             // emissivity of the surface rather than the emission coefficient
             // and the input specification MUST correspond to this.
             return
-                mpp.distribute
+                mpp.fromNeigbour
                 (
                     radiation.absorptionEmission().e()().boundaryField()
                     [
diff --git a/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
index 8e55b7a300..7bfb178033 100644
--- a/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
+++ b/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
@@ -115,7 +115,7 @@ Foam::semiPermeableBaffleMassFractionFvPatchScalarField::calcPhiYp() const
     const scalarField Yc(patchInternalField());
     const scalarField nbrYc
     (
-        mpp.distribute
+        mpp.fromNeigbour
         (
             nbrPatch.lookupPatchField<volScalarField, scalar>(YName)
            .patchInternalField()
@@ -134,7 +134,7 @@ Foam::semiPermeableBaffleMassFractionFvPatchScalarField::calcPhiYp() const
 
     const scalarField nbrAlphaEffDeltap
     (
-        mpp.distribute
+        mpp.fromNeigbour
         (
             ttm.kappaEff(nbrPatch.index())*nbrPatch.deltaCoeffs()
            /ttm.thermo().Cp().boundaryField()[nbrPatch.index()]
@@ -154,7 +154,7 @@ Foam::semiPermeableBaffleMassFractionFvPatchScalarField::calcPhiYp() const
     if (property_ == moleFraction || property_ == partialPressure)
     {
         tW = thermo.W(patch().index());
-        tNbrW = mpp.distribute(thermo.W(nbrPatch.index()));
+        tNbrW = mpp.fromNeigbour(thermo.W(nbrPatch.index()));
     }
 
     // Construct coefficients that convert mass fraction to the property that
@@ -174,7 +174,7 @@ Foam::semiPermeableBaffleMassFractionFvPatchScalarField::calcPhiYp() const
             {
                 k *= thermo.rho(patch().index())/Wi;
                 tmp<scalarField> nbrRhop =
-                    mpp.distribute(thermo.rho(nbrPatch.index()));
+                    mpp.fromNeigbour(thermo.rho(nbrPatch.index()));
                 nbrK *= nbrRhop/Wi;
             }
             break;
@@ -183,7 +183,7 @@ Foam::semiPermeableBaffleMassFractionFvPatchScalarField::calcPhiYp() const
             {
                 k *= thermo.p().boundaryField()[patch().index()]*tW/Wi;
                 tmp<scalarField> nbrPp =
-                    mpp.distribute
+                    mpp.fromNeigbour
                     (
                         thermo.p().boundaryField()[nbrPatch.index()]
                     );
diff --git a/src/surfaceFilmModels/surfaceFilm/surfaceFilmTemplates.C b/src/surfaceFilmModels/surfaceFilm/surfaceFilmTemplates.C
index 77946b52f8..83f3ba78b6 100644
--- a/src/surfaceFilmModels/surfaceFilm/surfaceFilmTemplates.C
+++ b/src/surfaceFilmModels/surfaceFilm/surfaceFilmTemplates.C
@@ -40,12 +40,12 @@ void Foam::surfaceFilm::toPrimary
     {
         if (intCoupledPatchIDs_[i] == filmPatchi)
         {
-            const mappedPatchBase& mpb =
+            const mappedPatchBase& mpp =
                 refCast<const mappedPatchBase>
                 (
                     mesh().boundaryMesh()[filmPatchi]
                 );
-            filmField = mpb.reverseDistribute(filmField);
+            filmField = mpp.toNeigbour(filmField);
             return;
         }
     }
@@ -67,13 +67,13 @@ Foam::tmp<Foam::Field<Type>> Foam::surfaceFilm::toFilm
     {
         if (intCoupledPatchIDs_[i] == filmPatchi)
         {
-            const mappedPatchBase& mpb =
+            const mappedPatchBase& mpp =
                 refCast<const mappedPatchBase>
                 (
                     mesh().boundaryMesh()[filmPatchi]
                 );
 
-            return mpb.distribute(primaryPatchField);
+            return mpp.fromNeigbour(primaryPatchField);
         }
     }
 
@@ -96,13 +96,13 @@ Foam::tmp<Foam::Field<Type>> Foam::surfaceFilm::toFilm
     {
         if (intCoupledPatchIDs_[i] == filmPatchi)
         {
-            const mappedPatchBase& mpb =
+            const mappedPatchBase& mpp =
                 refCast<const mappedPatchBase>
                 (
                     mesh().boundaryMesh()[filmPatchi]
                 );
 
-            return mpb.distribute(tprimaryPatchField);
+            return mpp.fromNeigbour(tprimaryPatchField);
         }
     }
 
@@ -129,11 +129,11 @@ void Foam::surfaceFilm::toFilm
         const polyPatch& filmPatch =
             mesh().boundaryMesh()[filmPatchi];
 
-        const mappedPatchBase& mpb =
+        const mappedPatchBase& mpp =
             refCast<const mappedPatchBase>(filmPatch);
 
         UIndirectList<Type>(rf, filmPatch.faceCells()) =
-            mpb.distribute(pBf[primaryPatchi]);
+            mpp.fromNeigbour(pBf[primaryPatchi]);
     }
 }