diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
index b912f96cd9..3a67f06950 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2019 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -236,14 +236,14 @@ Foam::labelList Foam::polyMeshTetDecomposition::findFaceBasePts
 
     labelList tetBasePtIs(mesh.nFaces(), -1);
 
-    label nInternalFaces = mesh.nInternalFaces();
+    const label nInternalFaces = mesh.nInternalFaces();
 
     for (label fI = 0; fI < nInternalFaces; ++fI)
     {
         tetBasePtIs[fI] = findSharedBasePoint(mesh, fI, tol, report);
     }
 
-    pointField neighbourCellCentres(mesh.nFaces() - nInternalFaces);
+    pointField neighbourCellCentres(mesh.nBoundaryFaces());
 
     for (label facei = nInternalFaces; facei < mesh.nFaces(); ++facei)
     {
@@ -257,8 +257,8 @@ Foam::labelList Foam::polyMeshTetDecomposition::findFaceBasePts
     SubList<label> boundaryFaceTetBasePtIs
     (
         tetBasePtIs,
-        mesh.nFaces() - nInternalFaces,
-        nInternalFaces
+        mesh.nBoundaryFaces(),
+        mesh.nInternalFaces()
     );
 
     for
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index a4e13997f0..d7b3948f96 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -727,8 +728,8 @@ void Foam::polyDualMesh::calcDual
         SubList<face>
         (
             mesh.faces(),
-            mesh.nFaces() - nIntFaces,
-            nIntFaces
+            mesh.nBoundaryFaces(),
+            mesh.nInternalFaces()
         ),
         mesh.points()
     );
@@ -781,7 +782,7 @@ void Foam::polyDualMesh::calcDual
     pointField dualPoints
     (
         mesh.nCells()                           // cell centres
-      + mesh.nFaces() - nIntFaces               // boundary face centres
+      + mesh.nBoundaryFaces()                   // boundary face centres
       + featureEdges.size()                     // additional boundary edges
       + featurePoints.size()                    // additional boundary points
     );
@@ -803,7 +804,7 @@ void Foam::polyDualMesh::calcDual
     // Boundary faces centres
     const pointField& faceCentres = mesh.faceCentres();
 
-    boundaryFacePoint_.setSize(mesh.nFaces() - nIntFaces);
+    boundaryFacePoint_.setSize(mesh.nBoundaryFaces());
 
     for (label facei = nIntFaces; facei < mesh.nFaces(); facei++)
     {
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 2c7a7733f1..ec38a6f59d 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,7 +65,7 @@ void Foam::dynamicRefineFvMesh::calculateProtectedCells
     unrefineableCell = protectedCell_;
 
     // Get neighbouring cell level
-    labelList neiLevel(nFaces()-nInternalFaces());
+    labelList neiLevel(nBoundaryFaces());
 
     for (label facei = nInternalFaces(); facei < nFaces(); ++facei)
     {
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index d1e2ef7c76..93c9b5ae87 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2015-2021 OpenCFD Ltd.
+    Copyright (C) 2015-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -385,7 +385,7 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
     labelList cellAddr(mesh_.nCells(), -1);
     const labelList& cellIDs = mesh_.cellZones()[cellZonei];
     labelUIndList(cellAddr, cellIDs) = identity(cellIDs.size());
-    labelList nbrFaceCellAddr(mesh_.nFaces() - nInternalFaces, -1);
+    labelList nbrFaceCellAddr(mesh_.nBoundaryFaces(), -1);
 
     forAll(pbm, patchi)
     {
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 0f3ade71f0..a638b55ae7 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -141,7 +141,7 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
     // Calculate cell addressing for selected cells
     labelList cellAddr(mesh_.nCells(), -1);
     labelUIndList(cellAddr, cells_) = identity(cells_.size());
-    labelList nbrFaceCellAddr(mesh_.nFaces() - nInternalFaces, -1);
+    labelList nbrFaceCellAddr(mesh_.nBoundaryFaces(), -1);
     forAll(pbm, patchi)
     {
         const polyPatch& pp = pbm[patchi];
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 0a3ffd140a..7064665f44 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -539,8 +539,8 @@ Foam::labelList Foam::meshRefinement::nearestIntersection
 
 
     // Swap neighbouring cell centres and cell level
-    labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
-    pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+    labelList neiLevel(mesh_.nBoundaryFaces());
+    pointField neiCc(mesh_.nBoundaryFaces());
     calcNeighbourData(neiLevel, neiCc);
 
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
index 7ddccb39da..4f23065d02 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2019,2022 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -193,7 +193,7 @@ void Foam::meshRefinement::markOutsideFaces
     }
     {
 
-        const label nBnd = mesh_.nFaces()-mesh_.nInternalFaces();
+        const label nBnd = mesh_.nBoundaryFaces();
 
         labelList neiRefineCell(nBnd);
         syncTools::swapBoundaryCellList(mesh_, refineCell, neiRefineCell);
@@ -948,8 +948,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::removeGapCells
 )
 {
     // Swap neighbouring cell centres and cell level
-    labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
-    pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+    labelList neiLevel(mesh_.nBoundaryFaces());
+    pointField neiCc(mesh_.nBoundaryFaces());
     calcNeighbourData(neiLevel, neiCc);
 
     labelList refineCell(mesh_.nCells(), -1);
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index 0ee6267660..601f7ca6a2 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -2092,8 +2092,8 @@ Foam::labelList Foam::meshRefinement::refineCandidates
 
 
         // Swap neighbouring cell centres and cell level
-        labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
-        pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+        labelList neiLevel(mesh_.nBoundaryFaces());
+        pointField neiCc(mesh_.nBoundaryFaces());
         calcNeighbourData(neiLevel, neiCc);
 
 
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
index 83c092b798..b3401415a0 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -114,7 +114,7 @@ void Foam::cellToFace::combine
 
 
         // Get coupled cell status
-        boolList neiInSet(mesh_.nFaces()-nInt, false);
+        boolList neiInSet(mesh_.nBoundaryFaces(), false);
 
         for (const polyPatch& pp : patches)
         {