From 59f3c55871f2514e7133c802f299aa43a9e4e783 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 8 Apr 2025 11:00:11 +0200
Subject: [PATCH] STYLE: avoid implicit cast of UList to List

---
 .../adjointShapeOptimizationFoam.C            |  7 +---
 .../createFields.H                            |  4 +-
 .../pimpleFoam/overPimpleDyMFoam/correctPhi.H |  2 +-
 .../VoFPatchTransfer/VoFPatchTransfer.C       |  2 +-
 .../interFoam/overInterDyMFoam/correctPhi.H   |  2 +-
 .../fluentMeshToFoam/fluentMeshToFoam.L       |  5 +--
 .../foamMeshToFluent/fluentFvMesh.C           |  3 +-
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   |  2 +-
 .../DelaunayMesh/DistributedDelaunayMesh.C    |  4 +-
 .../DelaunayMesh/DistributedDelaunayMesh.H    |  4 +-
 .../backgroundMeshDecomposition.C             |  2 +-
 .../backgroundMeshDecomposition.H             |  2 +-
 .../conformalVoronoiMeshCalcDualMesh.C        |  2 +-
 .../pointPairs/pointPairs.C                   |  2 +-
 .../pointPairs/pointPairs.H                   |  2 +-
 .../generation/foamyMesh/foamyQuadMesh/CV2D.H |  8 ++--
 .../insertSurfaceNearestPointPairs.C          |  8 ++--
 .../foamyQuadMesh/shortEdgeFilter2D.C         |  8 ++--
 .../mesh/manipulation/checkMesh/checkTools.C  |  4 +-
 .../manipulation/polyDualMesh/meshDualiser.C  | 19 ++++------
 .../manipulation/polyDualMesh/meshDualiser.H  |  9 ++---
 .../miscellaneous/patchSummary/patchSummary.C |  4 +-
 .../foamDataToFluent/writeFluentScalarField.C |  2 +-
 .../viewFactor2AI/viewFactor2AI.C             |  8 ++--
 .../viewFactor2AI/viewFactor2AI.H             |  8 ++--
 .../viewFactor2LI/viewFactor2LI.C             |  8 ++--
 .../viewFactor2LI/viewFactor2LI.H             |  8 ++--
 .../viewFactorHottel/viewFactorHottel.C       |  8 ++--
 .../viewFactorHottel/viewFactorHottel.H       |  8 ++--
 .../viewFactorModel/viewFactorModel.H         |  8 ++--
 .../setAlphaField/setAlphaField.C             | 10 ++---
 src/OpenFOAM/containers/Lists/List/UList.H    | 10 ++++-
 src/OpenFOAM/containers/Lists/List/UListI.H   |  7 ----
 .../lduMatrix/lduAddressing/lduAddressing.C   |  8 ++--
 .../lduCalculatedProcessorField.C             |  2 +-
 .../cyclicGAMGInterfaceField.C                |  4 +-
 src/OpenFOAM/meshes/lduMesh/lduMesh.C         |  4 +-
 .../parallel/commSchedule/commSchedule.C      |  2 +-
 .../atmNutWallFunctionFvPatchScalarField.C    |  2 +-
 .../atmNutkWallFunctionFvPatchScalarField.C   |  2 +-
 .../freeSurfacePointDisplacement.C            |  2 +-
 .../interfaceTrackingFvMesh.C                 | 37 ++++++++++---------
 .../attachDetach/attachInterface.C            |  4 +-
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 12 +++---
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.H |  6 +--
 .../hexRef8/refinementHistory.C               |  2 +-
 .../hexRef8/refinementHistory.H               |  2 +-
 .../enrichedPatch/enrichedPatch.H             |  6 +--
 .../faMesh/faMeshMapper/faPatchMapper.C       |  2 +-
 .../faPatches/basic/coupled/coupledFaPatch.H  |  2 +-
 .../expressions/patch/patchExprDriverFields.C |  2 +-
 .../calculatedProcessorFvPatchField.C         |  4 +-
 .../constraint/cyclic/cyclicFvPatchField.C    |  2 +-
 .../activeBaffleVelocityFvPatchVectorField.C  |  4 +-
 ...ureForceBaffleVelocityFvPatchVectorField.C |  4 +-
 .../fvPatchFields/fvPatchField/fvPatchField.C |  2 +-
 .../faceCorrectedSnGrad/faceCorrectedSnGrad.C |  4 +-
 .../solvers/MULES/CMULESTemplates.C           |  8 ++--
 .../fvMatrices/solvers/MULES/MULESTemplates.C |  6 +--
 .../interpolationPointMVC/pointMVCWeight.C    |  2 +-
 .../interpolationPointMVC/pointMVCWeight.H    |  2 +-
 .../schemes/linearUpwind/linearUpwind.C       |  8 ++--
 .../schemes/linearUpwind/linearUpwindV.C      |  4 +-
 .../outletStabilised/outletStabilised.H       | 30 ++++++---------
 .../schemes/pointLinear/pointLinear.C         |  4 +-
 .../field/fieldMinMax/fieldMinMaxTemplates.C  |  2 +-
 src/fvOptions/cellSetOption/cellSetOption.C   |  2 +-
 .../PairCollision/PairCollision.C             |  4 +-
 .../PairCollision/PairCollision.H             |  4 +-
 .../clouds/Templates/SprayCloud/SprayCloudI.H |  2 +-
 .../blockMesh/blockMesh/blockMeshCreate.C     |  2 +-
 .../meshRefinement/meshRefinement.C           |  6 +--
 .../meshRefinement/meshRefinement.H           |  6 +--
 .../snappyHexMeshDriver/snappyLayerDriver.C   |  8 ++--
 .../snappyHexMeshDriver/snappySnapDriver.H    |  8 ++--
 .../snappySnapDriverFeature.C                 |  8 ++--
 .../advancingFrontAMI/advancingFrontAMI.C     |  2 +-
 .../advancingFrontAMI/advancingFrontAMI.H     |  2 +-
 .../faceAreaWeightAMI/faceAreaWeightAMI.C     |  6 +--
 .../faceAreaWeightAMI/faceAreaWeightAMI.H     |  2 +-
 .../cyclicACMIGAMGInterfaceField.C            |  4 +-
 .../cyclicAMIGAMGInterfaceField.C             |  4 +-
 .../faceAreaIntersect/faceAreaIntersect.H     | 10 ++++-
 .../faceAreaIntersect/faceAreaIntersectI.H    | 13 -------
 .../adjointBoundaryCondition.C                |  2 +-
 ...ointOutletVelocityFluxFvPatchVectorField.C |  2 +-
 .../linearUpwindNormal/linearUpwindNormal.C   |  4 +-
 .../topODesignVariables/topODesignVariables.C |  6 +--
 .../adjointSpalartAllmaras.C                  |  2 +-
 .../adjointkOmegaSST/adjointkOmegaSST.C       | 12 +++---
 .../kaqRWallFunctionFvPatchScalarField.C      |  2 +-
 .../waWallFunctionFvPatchScalarField.C        |  2 +-
 .../cellCellStencil/cellCellStencil.C         |  2 +-
 .../cellCellStencilTemplates.C                |  2 +-
 .../cellVolumeWeightCellCellStencil.C         | 13 +++----
 .../inverseDistanceCellCellStencil.C          | 11 +++---
 .../trackingInverseDistanceCellCellStencil.C  |  4 +-
 src/overset/include/setCellMask.H             |  2 +-
 src/overset/include/setInterpolatedCells.H    |  2 +-
 .../oversetAdjustPhi/oversetAdjustPhi.C       |  4 +-
 src/overset/oversetFvMesh/oversetFvMeshBase.C |  4 +-
 src/overset/oversetFvMesh/oversetFvMeshBase.H |  4 +-
 .../oversetPolyPatch/oversetFvPatchField.C    | 12 +++---
 .../wallBoiling/wallBoiling.C                 |  2 +-
 .../IATEsources/wallBoiling/wallBoiling.C     |  2 +-
 .../singleLayerRegion/singleLayerRegion.C     |  2 +-
 .../curvatureSeparation/curvatureSeparation.C |  4 +-
 .../patchInjection/patchInjection.C           |  3 +-
 .../cellVolumeWeight/cellVolumeWeightMethod.C |  2 +-
 .../cellVolumeWeight/cellVolumeWeightMethod.H |  2 +-
 .../meshToMeshMethod/meshToMeshMethod.C       |  2 +-
 .../meshToMeshMethod/meshToMeshMethod.H       |  2 +-
 .../surface/isoSurface/isoSurfaceCell.H       |  6 +--
 .../isoSurface/isoSurfaceCellTemplates.C      |  6 +--
 .../surface/isoSurface/isoSurfacePoint.H      |  6 +--
 .../isoSurface/isoSurfacePointTemplates.C     |  6 +--
 .../radiationModels/solarLoad/solarLoad.C     |  6 +--
 .../isoAdvection/isoAdvection.C               | 16 +++-----
 .../isoAdvection/isoAdvection.H               |  5 +--
 119 files changed, 298 insertions(+), 336 deletions(-)

diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index be66f4cc53..79a06161d1 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -60,13 +60,10 @@ template<class Type>
 void zeroCells
 (
     GeometricField<Type, fvPatchField, volMesh>& vf,
-    const labelList& cells
+    const labelUList& cells
 )
 {
-    forAll(cells, i)
-    {
-        vf[cells[i]] = Zero;
-    }
+    UIndirectList<Type>(vf.primitiveField(), cells) = Zero;
 }
 
 
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
index 4d7b9d8811..3d19017f9d 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
@@ -103,8 +103,8 @@ dimensionedScalar alphaMax
     laminarTransport
 );
 
-const labelList& inletCells = mesh.boundary()["inlet"].faceCells();
-//const labelList& outletCells = mesh.boundary()["outlet"].faceCells();
+const labelUList& inletCells = mesh.boundary()["inlet"].faceCells();
+//const labelUList& outletCells = mesh.boundary()["outlet"].faceCells();
 
 volScalarField alpha
 (
diff --git a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
index 8c692c1378..f5304eea58 100644
--- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
@@ -55,7 +55,7 @@ if (mesh.changing())
     dimensionedScalar rAUf("rAUf", dimTime, 1.0);
 
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
+    const labelUList& cellTypes = overlap.cellTypes();
     const labelIOList& zoneIDs = overlap.zoneID();
 
     while (pimple.correctNonOrthogonal())
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C
index b0c52f0f62..e3e2d7ee5f 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C
@@ -210,7 +210,7 @@ void VoFPatchTransfer::correct
             film().toRegion(patchi, Vp);
 
             const polyPatch& pp = pbm[patchi];
-            const labelList& faceCells = pp.faceCells();
+            const labelUList& faceCells = pp.faceCells();
 
             // Accumulate the total mass removed from patch
             scalar dMassPatch = 0;
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
index 7df3631b04..9af4e28691 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
@@ -65,7 +65,7 @@
     dimensionedScalar rAUf("rAUf", dimTime/rho.dimensions(), 1.0);
 
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
+    const labelUList& cellTypes = overlap.cellTypes();
     const labelIOList& zoneIDs = overlap.zoneID();
 
     while (pimple.correctNonOrthogonal())
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index d74f4ab01c..200a45becd 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -1674,10 +1674,9 @@ int main(int argc, char *argv[])
             // Add cell zones to patch zone list
             forAll(bPatches, pI)
             {
-                const labelList& faceCells = bPatches[pI].faceCells();
-                forAll(faceCells, fcI)
+                for (const label celli : bPatches[pI].faceCells())
                 {
-                    if (zoneCell.test(faceCells[fcI]))
+                    if (zoneCell.test(celli))
                     {
                         boundaryZones[pI].append(name);
                         break;
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
index f212aee72a..75ee48cccf 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
@@ -161,8 +161,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const
     {
         const faceUList& patchFaces = boundaryMesh()[patchi];
 
-        const labelList& patchFaceCells =
-            boundaryMesh()[patchi].faceCells();
+        const labelUList& patchFaceCells = boundaryMesh()[patchi].faceCells();
 
         // The face group will be offset by 10 from the patch label
 
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 8e95e454a9..c91d9023bd 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -1506,7 +1506,7 @@ int main(int argc, char *argv[])
     // Go through all the patchFaces and find corresponding face in pp.
     forAll(patchFaces, patchi)
     {
-        const DynamicList<face>& pFaces = patchFaces[patchi];
+        const auto& pFaces = patchFaces[patchi];
 
         Info<< "Finding faces of patch " << patchi << endl;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 2c50d6c462..d0acdef622 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -42,7 +42,7 @@ template<class Triangulation>
 Foam::autoPtr<Foam::mapDistribute>
 Foam::DistributedDelaunayMesh<Triangulation>::buildMap
 (
-    const List<label>& toProc
+    const labelUList& toProc
 )
 {
     // Determine send map
@@ -431,7 +431,7 @@ void Foam::DistributedDelaunayMesh<Triangulation>::markVerticesToRefer
 template<class Triangulation>
 Foam::label Foam::DistributedDelaunayMesh<Triangulation>::referVertices
 (
-    const DynamicList<label>& targetProcessor,
+    const labelUList& targetProcessor,
     DynamicList<Vb>& parallelVertices,
     PtrList<labelPairHashSet>& referralVertices,
     labelPairHashSet& receivedVertices
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index 8a8c75cd97..1af5cba757 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
@@ -115,7 +115,7 @@ private:
 
         label referVertices
         (
-            const DynamicList<label>& targetProcessor,
+            const labelUList& targetProcessor,
             DynamicList<Vb>& parallelVertices,
             PtrList<labelPairHashSet>& referralVertices,
             labelPairHashSet& receivedVertices
@@ -160,7 +160,7 @@ public:
     // Member Functions
 
         //- Build a mapDistribute for the supplied destination processor data
-        static autoPtr<mapDistribute> buildMap(const List<label>& toProc);
+        static autoPtr<mapDistribute> buildMap(const labelUList& toProc);
 
         //-
         bool distribute(const boundBox& bb);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 48c0a68a63..4a93e7117b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -47,7 +47,7 @@ namespace Foam
 
 Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
 (
-    const List<label>& toProc
+    const labelUList& toProc
 )
 {
     // Determine send map
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index a0dd1bd11d..64ad37a169 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -213,7 +213,7 @@ public:
     // Member Functions
 
         //- Build a mapDistribute for the supplied destination processor data
-        static autoPtr<mapDistribute> buildMap(const List<label>& toProc);
+        static autoPtr<mapDistribute> buildMap(const labelUList& toProc);
 
         //- Redistribute the background mesh based on a supplied weight field,
         //  returning a map to use to redistribute vertices.
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index a90fa8ac51..8107aee818 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -945,7 +945,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findOffsetPatchFaces
         const faceList& localFaces = patch.localFaces();
         const pointField& localPoints = patch.localPoints();
 
-        const labelList& fCell = patch.faceCells();
+        const labelUList& fCell = patch.faceCells();
 
         forAll(localFaces, pLFI)
         {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
index b4f3e88b16..cfeb5885cf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
@@ -117,7 +117,7 @@ template<class Triangulation>
 inline bool Foam::pointPairs<Triangulation>::addPointPair
 (
     const labelPair& master,
-    const DynamicList<labelPair>& slaves
+    const UList<labelPair>& slaves
 )
 {
     for (const labelPair& slave : slaves)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
index 11feda75d4..3b16e5a044 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
@@ -130,7 +130,7 @@ public:
             inline bool addPointPair
             (
                 const labelPair& master,
-                const DynamicList<labelPair>& slaves
+                const UList<labelPair>& slaves
             );
 
             inline bool addPointPair
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
index 2efc703e5e..0f3735423f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
@@ -262,10 +262,10 @@ private:
         //  and write the inserted point locations to the given file.
         void insertPointPairs
         (
-            const DynamicList<point2D>& nearSurfacePoints,
-            const DynamicList<point2D>& surfacePoints,
-            const DynamicList<label>& surfaceTris,
-            const DynamicList<label>& surfaceHits,
+            const UList<point2D>& nearSurfacePoints,
+            const UList<point2D>& surfacePoints,
+            const labelUList& surfaceTris,
+            const labelUList& surfaceHits,
             const fileName fName
         );
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
index d9b88edbdc..694ff9efea 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
@@ -75,10 +75,10 @@ bool Foam::CV2D::dualCellSurfaceIntersection
 
 void Foam::CV2D::insertPointPairs
 (
-    const DynamicList<point2D>& nearSurfacePoints,
-    const DynamicList<point2D>& surfacePoints,
-    const DynamicList<label>& surfaceTris,
-    const DynamicList<label>& surfaceHits,
+    const UList<point2D>& nearSurfacePoints,
+    const UList<point2D>& surfacePoints,
+    const labelUList& surfaceTris,
+    const labelUList& surfaceHits,
     const fileName fName
 )
 {
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index 3141e0a4b3..92ec92926b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
@@ -80,10 +80,10 @@ void Foam::shortEdgeFilter2D::updateEdgeRegionMap
 
         label region = -1;
 
-        const DynamicList<label>& startPtRegions =
+        const labelUList& startPtRegions =
             boundaryPtRegions[surfPtToBoundaryPt[meshPoints[e.first()]]];
 
-        const DynamicList<label>& endPtRegions =
+        const labelUList& endPtRegions =
             boundaryPtRegions[surfPtToBoundaryPt[meshPoints[e.second()]]];
 
         if (startPtRegions.size() > 1 && endPtRegions.size() > 1)
@@ -363,9 +363,9 @@ void Foam::shortEdgeFilter2D::filter()
              && !flagDegenerateFace
             )
             {
-                const DynamicList<label>& startVertexRegions =
+                const labelUList& startVertexRegions =
                     boundaryPointRegions[meshPoints[startVertex]];
-                const DynamicList<label>& endVertexRegions =
+                const labelUList& endVertexRegions =
                     boundaryPointRegions[meshPoints[endVertex]];
 
                 if (startVertexRegions.size() && endVertexRegions.size())
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
index 8b6b0d3195..36d1b4755d 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
@@ -294,7 +294,7 @@ void Foam::mergeAndWrite
     forAll(pbm, patchi)
     {
         const polyPatch& pp = pbm[patchi];
-        const labelList& fc = pp.faceCells();
+        const labelUList& fc = pp.faceCells();
         forAll(fc, i)
         {
             bndInSet[pp.start()+i-mesh.nInternalFaces()] = isInSet[fc[i]];
@@ -319,7 +319,7 @@ void Foam::mergeAndWrite
     forAll(pbm, patchi)
     {
         const polyPatch& pp = pbm[patchi];
-        const labelList& fc = pp.faceCells();
+        const labelUList& fc = pp.faceCells();
         if (pp.coupled())
         {
             forAll(fc, i)
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index c5cdb17370..a3d8b6e510 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -33,6 +33,7 @@ License
 #include "mapPolyMesh.H"
 #include "edgeFaceCirculator.H"
 #include "mergePoints.H"
+#include "DynamicList.H"
 #include "OFstream.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -98,20 +99,14 @@ void Foam::meshDualiser::dumpPolyTopoChange
     Info<< "Dumping current polyTopoChange. Faces to " << str1.name()
         << " , points and edges to " << str2.name() << endl;
 
-    const DynamicList<point>& points = meshMod.points();
-
-    forAll(points, pointi)
+    for (const auto& p : meshMod.points())
     {
-        meshTools::writeOBJ(str1, points[pointi]);
-        meshTools::writeOBJ(str2, points[pointi]);
+        meshTools::writeOBJ(str1, p);
+        meshTools::writeOBJ(str2, p);
     }
 
-    const DynamicList<face>& faces = meshMod.faces();
-
-    forAll(faces, facei)
+    for (const face& f : meshMod.faces())
     {
-        const face& f = faces[facei];
-
         str1<< 'f';
         forAll(f, fp)
         {
@@ -210,7 +205,7 @@ Foam::label Foam::meshDualiser::addInternalFace
     const bool edgeOrder,
     const label dualCell0,
     const label dualCell1,
-    const DynamicList<label>& verts,
+    const labelUList& verts,
     polyTopoChange& meshMod
 ) const
 {
@@ -326,7 +321,7 @@ Foam::label Foam::meshDualiser::addBoundaryFace
 
     const label dualCelli,
     const label patchi,
-    const DynamicList<label>& verts,
+    const labelUList& verts,
     polyTopoChange& meshMod
 ) const
 {
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
index d65d796d08..e10b8c9a98 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
@@ -46,10 +46,9 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshDualiser_H
-#define meshDualiser_H
+#ifndef Foam_meshDualiser_H
+#define Foam_meshDualiser_H
 
-#include "DynamicList.H"
 #include "bitSet.H"
 #include "boolList.H"
 #include "typeInfo.H"
@@ -124,7 +123,7 @@ class meshDualiser
             const bool edgeOrder,
             const label dualCell0,
             const label dualCell1,
-            const DynamicList<label>& verts,
+            const labelUList& verts,
             polyTopoChange& meshMod
         ) const;
 
@@ -137,7 +136,7 @@ class meshDualiser
 
             const label dualCelli,
             const label patchi,
-            const DynamicList<label>& verts,
+            const labelUList& verts,
             polyTopoChange& meshMod
         ) const;
 
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
index 14d9e3f9ea..a451b1134a 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
@@ -191,10 +191,8 @@ int main(int argc, char *argv[])
             }
 
 
-            forAll(groupToPatches, groupI)
+            for (const auto& patchIDs : groupToPatches)
             {
-                const DynamicList<label>& patchIDs = groupToPatches[groupI];
-
                 if (patchIDs.size() > 1)
                 {
                     // Check if part of a group
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/writeFluentScalarField.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/writeFluentScalarField.C
index 56dd1c626d..9a00f738bd 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/writeFluentScalarField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/writeFluentScalarField.C
@@ -76,7 +76,7 @@ void Foam::writeFluentField
             const scalarField& phiInternal = phi;
 
             // Get reference to internal cells
-            const labelList emptyFaceCells =
+            const auto& emptyFaceCells =
                 phi.boundaryField()[patchi].patch().patch().faceCells();
 
             // Writing cells for empty patch
diff --git a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2AI/viewFactor2AI.C b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2AI/viewFactor2AI.C
index 2b7afe34bf..ff333a20e0 100644
--- a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2AI/viewFactor2AI.C
+++ b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2AI/viewFactor2AI.C
@@ -78,10 +78,10 @@ Foam::scalarListList Foam::VF::viewFactor2AI::calculate
     const labelListList& visibleFaceFaces,
     const pointField& compactCf,
     const vectorField& compactSf,
-    const List<List<vector>>& compactFineSf,
-    const List<List<point>>& compactFineCf,
-    const DynamicList<List<point>>& compactPoints,
-    const DynamicList<label>& compactPatchId
+    const UList<List<vector>>& compactFineSf,
+    const UList<List<point>>& compactFineCf,
+    const UList<List<point>>& compactPoints,
+    const UList<label>& compactPatchId
 ) const
 {
     // Fill local view factor matrix
diff --git a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2AI/viewFactor2AI.H b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2AI/viewFactor2AI.H
index 9ba377435b..3610dc9239 100644
--- a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2AI/viewFactor2AI.H
+++ b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2AI/viewFactor2AI.H
@@ -85,10 +85,10 @@ protected:
             const labelListList& visibleFaceFaces,
             const pointField& compactCf,
             const vectorField& compactSf,
-            const List<List<vector>>& compactFineSf,
-            const List<List<point>>& compactFineCf,
-            const DynamicList<List<point>>& compactPoints,
-            const DynamicList<label>& compactPatchId
+            const UList<List<vector>>& compactFineSf,
+            const UList<List<point>>& compactFineCf,
+            const UList<List<point>>& compactPoints,
+            const UList<label>& compactPatchId
         ) const;
 
 
diff --git a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2LI/viewFactor2LI.C b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2LI/viewFactor2LI.C
index 273b5c2ac5..d81598e685 100644
--- a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2LI/viewFactor2LI.C
+++ b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2LI/viewFactor2LI.C
@@ -84,10 +84,10 @@ Foam::scalarListList Foam::VF::viewFactor2LI::calculate
     const labelListList& visibleFaceFaces,
     const pointField& compactCf,
     const vectorField& compactSf,
-    const List<List<vector>>& compactFineSf,
-    const List<List<point>>& compactFineCf,
-    const DynamicList<List<point>>& compactPoints,
-    const DynamicList<label>& compactPatchId
+    const UList<List<vector>>& compactFineSf,
+    const UList<List<point>>& compactFineCf,
+    const UList<List<point>>& compactPoints,
+    const UList<label>& compactPatchId
 ) const
 {
     // Fill local view factor matrix
diff --git a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2LI/viewFactor2LI.H b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2LI/viewFactor2LI.H
index 0d2c0d273d..94625f654a 100644
--- a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2LI/viewFactor2LI.H
+++ b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactor2LI/viewFactor2LI.H
@@ -98,10 +98,10 @@ protected:
             const labelListList& visibleFaceFaces,
             const pointField& compactCf,
             const vectorField& compactSf,
-            const List<List<vector>>& compactFineSf,
-            const List<List<point>>& compactFineCf,
-            const DynamicList<List<point>>& compactPoints,
-            const DynamicList<label>& compactPatchId
+            const UList<List<vector>>& compactFineSf,
+            const UList<List<point>>& compactFineCf,
+            const UList<List<point>>& compactPoints,
+            const UList<label>& compactPatchId
         ) const;
 
 
diff --git a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorHottel/viewFactorHottel.C b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorHottel/viewFactorHottel.C
index 3b352ab69f..85ae0b75df 100644
--- a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorHottel/viewFactorHottel.C
+++ b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorHottel/viewFactorHottel.C
@@ -63,10 +63,10 @@ Foam::scalarListList Foam::VF::viewFactorHottel::calculate
     const labelListList& visibleFaceFaces,
     const pointField& compactCf,
     const vectorField& compactSf,
-    const List<List<vector>>& compactFineSf,
-    const List<List<point>>& compactFineCf,
-    const DynamicList<List<point>>& compactPoints,
-    const DynamicList<label>& compactPatchId
+    const UList<List<vector>>& compactFineSf,
+    const UList<List<point>>& compactFineCf,
+    const UList<List<point>>& compactPoints,
+    const UList<label>& compactPatchId
 ) const
 {
     // Fill local view factor matrix
diff --git a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorHottel/viewFactorHottel.H b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorHottel/viewFactorHottel.H
index da7bade587..0b11f75b3c 100644
--- a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorHottel/viewFactorHottel.H
+++ b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorHottel/viewFactorHottel.H
@@ -103,10 +103,10 @@ protected:
             const labelListList& visibleFaceFaces,
             const pointField& compactCf,
             const vectorField& compactSf,
-            const List<List<vector>>& compactFineSf,
-            const List<List<point>>& compactFineCf,
-            const DynamicList<List<point>>& compactPoints,
-            const DynamicList<label>& compactPatchId
+            const UList<List<vector>>& compactFineSf,
+            const UList<List<point>>& compactFineCf,
+            const UList<List<point>>& compactPoints,
+            const UList<label>& compactPatchId
         ) const;
 
 
diff --git a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorModel/viewFactorModel.H b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorModel/viewFactorModel.H
index 549c50978d..a2ed02d934 100644
--- a/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorModel/viewFactorModel.H
+++ b/applications/utilities/preProcessing/createViewFactors/viewFactorModels/viewFactorModel/viewFactorModel/viewFactorModel.H
@@ -117,10 +117,10 @@ protected:
             const labelListList& visibleFaceFaces,
             const pointField& compactCoarseCf,
             const vectorField& compactCoarseSf,
-            const List<List<vector>>& compactFineSf,
-            const List<List<point>>& compactFineCf,
-            const DynamicList<List<point>>& compactPoints,
-            const DynamicList<label>& compactPatchId
+            const UList<List<vector>>& compactFineSf,
+            const UList<List<point>>& compactFineCf,
+            const UList<List<point>>& compactPoints,
+            const labelUList& compactPatchId
         ) const = 0;
 
 
diff --git a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
index 867e8762b7..d6f754d286 100644
--- a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
+++ b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
@@ -55,7 +55,7 @@ Description
 
 void isoFacesToFile
 (
-    const DynamicList<List<point>>& faces,
+    const UList<List<point>>& faces,
     const word& fileName
 )
 {
@@ -65,7 +65,7 @@ void isoFacesToFile
     if (Pstream::parRun())
     {
         // Collect points from all the processors
-        List<DynamicList<List<point>>> allProcFaces(Pstream::nProcs());
+        List<List<List<point>>> allProcFaces(Pstream::nProcs());
         allProcFaces[Pstream::myProcNo()] = faces;
         Pstream::gatherList(allProcFaces);
 
@@ -73,9 +73,9 @@ void isoFacesToFile
         {
             Info<< "Writing file: " << fileName << endl;
 
-            for (const DynamicList<List<point>>& procFaces : allProcFaces)
+            for (const auto& procFaces : allProcFaces)
             {
-                for (const List<point>& facePts : procFaces)
+                for (const auto& facePts : procFaces)
                 {
                     os.writeFace(facePts);
                 }
@@ -86,7 +86,7 @@ void isoFacesToFile
     {
         Info<< "Writing file: " << fileName << endl;
 
-        for (const List<point>& facePts : faces)
+        for (const auto& facePts : faces)
         {
             os.writeFace(facePts);
         }
diff --git a/src/OpenFOAM/containers/Lists/List/UList.H b/src/OpenFOAM/containers/Lists/List/UList.H
index ede6083323..2af60648ff 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.H
+++ b/src/OpenFOAM/containers/Lists/List/UList.H
@@ -424,8 +424,14 @@ public:
         //       out-of-range element returns false without ill-effects
         inline const T& operator[](const label i) const;
 
-        //- Allow cast to a const List<T>&
-        inline operator const Foam::List<T>&() const;
+        //- Allow cast to a const List<T>&.
+        //  \note Marked as "strictly" deprecated.
+        //  Currently (2025-04) code still depends on this cast.
+        FOAM_DEPRECATED_STRICTER(2025-04, "dereference as UList, not List")
+        operator const Foam::List<T>&() const
+        {
+            return *reinterpret_cast<const List<T>*>(this);
+        }
 
         //- Assignment of all entries to the given value
         inline void operator=(const T& val);
diff --git a/src/OpenFOAM/containers/Lists/List/UListI.H b/src/OpenFOAM/containers/Lists/List/UListI.H
index de385d6116..9e544cbfcf 100644
--- a/src/OpenFOAM/containers/Lists/List/UListI.H
+++ b/src/OpenFOAM/containers/Lists/List/UListI.H
@@ -385,13 +385,6 @@ inline const T& Foam::UList<T>::operator[](const label i) const
 }
 
 
-template<class T>
-inline Foam::UList<T>::operator const Foam::List<T>&() const
-{
-    return *reinterpret_cast<const List<T>*>(this);
-}
-
-
 // * * * * * * * * * * * * * * STL Member Functions  * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index 81b80f0efb..d90d1b9821 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -80,7 +80,7 @@ void Foam::lduAddressing::calcLosort() const
 
     forAll(cellNbrFaces, celli)
     {
-        const labelList& curNbr = cellNbrFaces[celli];
+        const labelUList& curNbr = cellNbrFaces[celli];
 
         forAll(curNbr, curNbrI)
         {
@@ -100,7 +100,7 @@ void Foam::lduAddressing::calcOwnerStart() const
             << abort(FatalError);
     }
 
-    const labelList& own = lowerAddr();
+    const labelUList& own = lowerAddr();
 
     ownerStartPtr_ = std::make_unique<labelList>(size() + 1, own.size());
     auto& ownStart = *ownerStartPtr_;
@@ -139,9 +139,9 @@ void Foam::lduAddressing::calcLosortStart() const
     losortStartPtr_ = std::make_unique<labelList>(size() + 1, Foam::zero{});
     auto& lsrtStart = *losortStartPtr_;
 
-    const labelList& nbr = upperAddr();
+    const labelUList& nbr = upperAddr();
 
-    const labelList& lsrt = losortAddr();
+    const labelUList& lsrt = losortAddr();
 
     // Set up first lookup by hand
     lsrtStart[0] = 0;
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
index 075a79f446..2eba61fb8f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
@@ -99,7 +99,7 @@ void Foam::lduCalculatedProcessorField<Type>::initInterfaceMatrixUpdate
     }
 
     // Bypass patchInternalField since uses fvPatch addressing
-    const labelList& fc = lduAddr.patchAddr(patchId);
+    const labelUList& fc = lduAddr.patchAddr(patchId);
 
     scalarSendBuf_.resize_nocopy(fc.size());
     forAll(fc, i)
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
index 439a3f936f..a6c358984c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
@@ -162,7 +162,7 @@ void Foam::cyclicGAMGInterfaceField::updateInterfaceMatrix
 {
     // Get neighbouring field
 
-    const labelList& nbrFaceCells =
+    const auto& nbrFaceCells =
         lduAddr.patchAddr
         (
             cyclicInterface_.neighbPatchID()
@@ -172,7 +172,7 @@ void Foam::cyclicGAMGInterfaceField::updateInterfaceMatrix
 
     transformCoupleField(pnf, cmpt);
 
-    const labelList& faceCells = lduAddr.patchAddr(patchId);
+    const auto& faceCells = lduAddr.patchAddr(patchId);
 
     this->addToInternalField(result, !add, faceCells, coeffs, pnf);
 }
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.C b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
index a6c62c3811..e7dbad5f2a 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
@@ -105,8 +105,8 @@ Foam::Ostream& Foam::operator<<
     // Print actual contents
     if (lduMesh::debug)
     {
-        const labelList& l = addr.lowerAddr();
-        const labelList& u = addr.upperAddr();
+        const labelUList& l = addr.lowerAddr();
+        const labelUList& u = addr.upperAddr();
         forAll(l, facei)
         {
             os  << "        face:" << facei << " l:" << l[facei]
diff --git a/src/OpenFOAM/parallel/commSchedule/commSchedule.C b/src/OpenFOAM/parallel/commSchedule/commSchedule.C
index ae5817627c..5386ea857e 100644
--- a/src/OpenFOAM/parallel/commSchedule/commSchedule.C
+++ b/src/OpenFOAM/parallel/commSchedule/commSchedule.C
@@ -49,7 +49,7 @@ namespace Foam
 static label outstandingComms
 (
     const labelUList& commToSchedule,
-    const DynamicList<label>& procComms
+    const labelUList& procComms
 )
 {
     label nOutstanding = 0;
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
index da1a3fd09a..c6a727b0f3 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
@@ -86,7 +86,7 @@ tmp<scalarField> atmNutWallFunctionFvPatchScalarField::calcNut() const
     }
     #endif
 
-    const labelList& faceCells = patch().faceCells();
+    const labelUList& faceCells = patch().faceCells();
 
     forAll(nutw, facei)
     {
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
index deaae7c9dc..a1f0b7ec39 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
@@ -84,7 +84,7 @@ tmp<scalarField> atmNutkWallFunctionFvPatchScalarField::calcNut() const
     }
     #endif
 
-    const labelList& faceCells = patch().faceCells();
+    const labelUList& faceCells = patch().faceCells();
 
     // (HW:Eq. 5)
     forAll(nutw, facei)
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C
index 8661837cf2..6382d9a5f0 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C
@@ -113,7 +113,7 @@ Foam::interfaceTrackingFvMesh::pointDisplacement()
             aMesh().boundary()[patchI].ngbPolyPatchFaceNormals()
         );
 
-        const labelList& eFaces =
+        const labelUList& eFaces =
             aMesh().boundary()[patchI].edgeFaces();
 
         // Correct N according to specified contact angle
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
index d74fe5b006..e0644c2f24 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
@@ -733,12 +733,13 @@ void Foam::interfaceTrackingFvMesh::initializeControlPointsPosition()
                     << abort(FatalError);
             }
 
-            const labelList& eFaces =
-                aMesh().boundary()[fixedPatchID].edgeFaces();
-
-            forAll(eFaces, edgeI)
+            for
+            (
+                const label facei
+              : aMesh().boundary()[fixedPatchID].edgeFaces()
+            )
             {
-                deltaH[eFaces[edgeI]] *= 2.0;
+                deltaH[facei] *= 2.0;
             }
         }
 
@@ -789,12 +790,13 @@ void Foam::interfaceTrackingFvMesh::smoothFreeSurfaceMesh()
                 << abort(FatalError);
         }
 
-        const labelList& eFaces =
-            aMesh().boundary()[fixedPatchID].edgeFaces();
-
-        forAll(eFaces, edgeI)
+        for
+        (
+            const label facei
+          : aMesh().boundary()[fixedPatchID].edgeFaces()
+        )
         {
-            deltaHf[eFaces[edgeI]] *= 2.0;
+            deltaHf[facei] *= 2.0;
         }
     }
 
@@ -1060,7 +1062,7 @@ void Foam::interfaceTrackingFvMesh::correctPointDisplacement
         const labelList& pLabels =
             aMesh().boundary()[fixedPatchID].pointLabels();
 
-        const labelList& eFaces =
+        const labelUList& eFaces =
             aMesh().boundary()[fixedPatchID].edgeFaces();
 
         labelHashSet pointSet;
@@ -1147,7 +1149,7 @@ void Foam::interfaceTrackingFvMesh::correctPointDisplacement
         const labelList& pLabels =
             aMesh().boundary()[nonReflectingPatchID].pointLabels();
 
-        const labelList& eFaces =
+        const labelUList& eFaces =
             aMesh().boundary()[nonReflectingPatchID].edgeFaces();
 
         labelList corrPoints = pLabels;
@@ -2123,12 +2125,13 @@ bool Foam::interfaceTrackingFvMesh::update()
                     << abort(FatalError);
             }
 
-            const labelList& eFaces =
-                aMesh().boundary()[fixedPatchID].edgeFaces();
-
-            forAll(eFaces, edgeI)
+            for
+            (
+                const label facei
+              : aMesh().boundary()[fixedPatchID].edgeFaces()
+            )
             {
-                deltaHf[eFaces[edgeI]] *= 2.0;
+                deltaHf[facei] *= 2.0;
             }
         }
 
diff --git a/src/dynamicMesh/attachDetach/attachInterface.C b/src/dynamicMesh/attachDetach/attachInterface.C
index 70e996d297..4a420a21d8 100644
--- a/src/dynamicMesh/attachDetach/attachInterface.C
+++ b/src/dynamicMesh/attachDetach/attachInterface.C
@@ -110,8 +110,8 @@ void Foam::attachDetach::attachInterface
     }
 
     // Modify the faces from the master patch
-    const labelList& masterFaceCells = masterPatch.faceCells();
-    const labelList& slaveFaceCells = slavePatch.faceCells();
+    const labelUList& masterFaceCells = masterPatch.faceCells();
+    const labelUList& slaveFaceCells = slavePatch.faceCells();
 
     const boolList& mfFlip = mesh.faceZones()[faceZoneID_.index()].flipMap();
 
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index a2ff832681..8d586f8bdb 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -1339,14 +1339,14 @@ void Foam::polyMeshAdder::mergeZones
 
 void Foam::polyMeshAdder::addZones
 (
-    const DynamicList<word>& pointZoneNames,
+    const UList<word>& pointZoneNames,
     const List<DynamicList<label>>& pzPoints,
 
-    const DynamicList<word>& faceZoneNames,
+    const UList<word>& faceZoneNames,
     const List<DynamicList<label>>& fzFaces,
     const List<DynamicList<bool>>& fzFlips,
 
-    const DynamicList<word>& cellZoneNames,
+    const UList<word>& cellZoneNames,
     const List<DynamicList<label>>& czCells,
 
     polyMesh& mesh
@@ -2423,9 +2423,9 @@ void Foam::polyMeshAdder::patchFacePairs
     {
         const auto& mesh = meshes[meshi];
         const polyBoundaryMesh& pbm = mesh.boundaryMesh();
-        const DynamicList<label>& procPatches = localPatch[meshi];
-        const DynamicList<label>& procNbrs = remoteMesh[meshi];
-        const DynamicList<label>& procNbrPatches = remotePatch[meshi];
+        const labelUList& procPatches = localPatch[meshi];
+        const labelUList& procNbrs = remoteMesh[meshi];
+        const labelUList& procNbrPatches = remotePatch[meshi];
 
 
         // Count number of processor faces
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
index cad076ca04..6af9c4e1cd 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
@@ -226,14 +226,14 @@ class polyMeshAdder
         //- Create new zones and add to new mesh.
         static void addZones
         (
-            const DynamicList<word>& pointZoneNames,
+            const UList<word>& pointZoneNames,
             const List<DynamicList<label>>& pzPoints,
 
-            const DynamicList<word>& faceZoneNames,
+            const UList<word>& faceZoneNames,
             const List<DynamicList<label>>& fzFaces,
             const List<DynamicList<bool>>& fzFlips,
 
-            const DynamicList<word>& cellZoneNames,
+            const UList<word>& cellZoneNames,
             const List<DynamicList<label>>& czCells,
 
             polyMesh& mesh
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
index c842c2a696..6f2ee3caf3 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
@@ -983,7 +983,7 @@ Foam::autoPtr<Foam::refinementHistory> Foam::refinementHistory::clone
 Foam::autoPtr<Foam::refinementHistory> Foam::refinementHistory::clone
 (
     const IOobject& io,
-    const labelList& cellMap
+    const labelUList& cellMap
 ) const
 {
     if (active_)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
index 6f40cf11dd..9f50fb348c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
@@ -341,7 +341,7 @@ public:
         autoPtr<refinementHistory> clone
         (
             const IOobject& io,
-            const labelList& cellMap
+            const labelUList& cellMap
         ) const;
 
         //- Update numbering for mesh changes
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
index 2689d449f8..9dd3f61569 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
@@ -86,13 +86,13 @@ class enrichedPatch
         mutable Map<label> pointMergeMap_;
 
         //- Slave point point hits
-        const labelList& slavePointPointHits_;
+        const labelUList& slavePointPointHits_;
 
         //- Slave point edge hits
-        const labelList& slavePointEdgeHits_;
+        const labelUList& slavePointEdgeHits_;
 
         //- Slave point face hits
-        const List<objectHit>& slavePointFaceHits_;
+        const UList<objectHit>& slavePointFaceHits_;
 
 
     // Demand-driven private data
diff --git a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C
index 88f8393b54..42a2227f99 100644
--- a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C
+++ b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C
@@ -63,7 +63,7 @@ void Foam::faPatchMapper::calcAddressing() const
     }
 
     // Go through new edgeFaces and for each edge try to locate old index
-    const labelList& ef = patch_.edgeFaces();
+    const labelUList& ef = patch_.edgeFaces();
 
     forAll(ef, efI)
     {
diff --git a/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.H b/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.H
index d7e0dc74ce..504355122d 100644
--- a/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.H
+++ b/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.H
@@ -119,7 +119,7 @@ public:
         coupledFaPatch
         (
             const word& name,
-            const labelList& edgeLabels,
+            const labelUList& edgeLabels,
             const label index,
             const faBoundaryMesh& bm,
             const label nbrPolyPatchIndex,
diff --git a/src/finiteVolume/expressions/patch/patchExprDriverFields.C b/src/finiteVolume/expressions/patch/patchExprDriverFields.C
index 2b1326b9fc..32f1b47a32 100644
--- a/src/finiteVolume/expressions/patch/patchExprDriverFields.C
+++ b/src/finiteVolume/expressions/patch/patchExprDriverFields.C
@@ -84,7 +84,7 @@ Foam::expressions::patchExpr::parseDriver::field_cellSelection
     // Not particularly efficient...
     labelHashSet inSelection(tselected());
 
-    const labelList& faceCells = patch_.faceCells();
+    const labelUList& faceCells = patch_.faceCells();
     auto tresult = tmp<boolField>::New(this->size(), false);
     auto& result = tresult.ref();
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
index 682a4481fb..d89655e902 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
@@ -129,7 +129,7 @@ void Foam::calculatedProcessorFvPatchField<Type>::initEvaluate
         // Bypass patchInternalField since uses fvPatch addressing
         {
             const Field<Type>& iF = this->internalField();
-            const labelList& fc = procInterface_.faceCells();
+            const labelUList& fc = procInterface_.faceCells();
             sendBuf_.resize_nocopy(fc.size());
             forAll(fc, i)
             {
@@ -202,7 +202,7 @@ void Foam::calculatedProcessorFvPatchField<Type>::initInterfaceMatrixUpdate
     }
 
     // Bypass patchInternalField since uses fvPatch addressing
-    const labelList& fc = lduAddr.patchAddr(patchId);
+    const labelUList& fc = lduAddr.patchAddr(patchId);
 
     scalarSendBuf_.resize_nocopy(fc.size());
     forAll(fc, i)
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 380b6e4999..548ae95d90 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -222,7 +222,7 @@ void Foam::cyclicFvPatchField<Type>::updateInterfaceMatrix
     const Pstream::commsTypes
 ) const
 {
-    const labelList& nbrFaceCells =
+    const labelUList& nbrFaceCells =
         lduAddr.patchAddr
         (
             this->cyclicPatch().neighbPatchID()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 8722e4b16e..f4ba5c4137 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -227,12 +227,12 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
         );
 
         const fvPatch& cyclicPatch = patch().boundaryMesh()[cyclicPatchLabel_];
-        const labelList& cyclicFaceCells = cyclicPatch.patch().faceCells();
+        const labelUList& cyclicFaceCells = cyclicPatch.patch().faceCells();
         const fvPatch& nbrPatch = refCast<const cyclicFvPatch>
         (
             cyclicPatch
         ).neighbFvPatch();
-        const labelList& nbrFaceCells = nbrPatch.patch().faceCells();
+        const labelUList& nbrFaceCells = nbrPatch.patch().faceCells();
 
         scalar forceDiff = 0;
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index f2b719f545..845899c354 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -253,11 +253,11 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs()
             db().lookupObject<volScalarField>(pName_);
 
         const fvPatch& cyclicPatch = patch().boundaryMesh()[cyclicPatchLabel_];
-        const labelList& cyclicFaceCells = cyclicPatch.patch().faceCells();
+        const labelUList& cyclicFaceCells = cyclicPatch.patch().faceCells();
         const fvPatch& nbrPatch =
             refCast<const cyclicFvPatch>(cyclicPatch).neighbFvPatch();
 
-        const labelList& nbrFaceCells = nbrPatch.patch().faceCells();
+        const labelUList& nbrFaceCells = nbrPatch.patch().faceCells();
 
         scalar valueDiff = 0;
         scalar area = 0;
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index ada91e0d51..0fb4255c42 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -272,7 +272,7 @@ void Foam::fvPatchField<Type>::autoMap
              && mapper.directAddressing().size()
             )
             {
-                const labelList& mapAddressing = mapper.directAddressing();
+                const labelUList& mapAddressing = mapper.directAddressing();
 
                 forAll(mapAddressing, i)
                 {
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
index 46982ebda8..3e970fbfa3 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
@@ -71,8 +71,8 @@ Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
     const vectorField& Sf = mesh.Sf();
     const vectorField& C = mesh.C();
     const scalarField& magSf = mesh.magSf();
-    const labelList& owner = mesh.owner();
-    const labelList& neighbour = mesh.neighbour();
+    const auto& owner = mesh.owner();
+    const auto& neighbour = mesh.neighbour();
 
     forAll(sfCorr, facei)
     {
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index 070e9b557b..80e686e64b 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -322,7 +322,7 @@ void Foam::MULES::limiterCorr
         const fvPatchScalarField& psiPf = psiBf[patchi];
         const scalarField& phiCorrPf = phiCorrBf[patchi];
 
-        const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
+        const labelUList& pFaceCells = mesh.boundary()[patchi].faceCells();
 
         if (psiPf.coupled())
         {
@@ -441,7 +441,7 @@ void Foam::MULES::limiterCorr
             scalarField& lambdaPf = lambdaBf[patchi];
             const scalarField& phiCorrfPf = phiCorrBf[patchi];
 
-            const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
+            const labelUList& pFaceCells = mesh.boundary()[patchi].faceCells();
 
             forAll(lambdaPf, pFacei)
             {
@@ -515,7 +515,7 @@ void Foam::MULES::limiterCorr
             }
             else if (psiPf.coupled())
             {
-                const labelList& pFaceCells =
+                const labelUList& pFaceCells =
                     mesh.boundary()[patchi].faceCells();
 
                 forAll(lambdaPf, pFacei)
@@ -536,7 +536,7 @@ void Foam::MULES::limiterCorr
             }
             else
             {
-                const labelList& pFaceCells =
+                const labelUList& pFaceCells =
                     mesh.boundary()[patchi].faceCells();
                 const scalarField& phiPf = phiBf[patchi];
 
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 30ad56a9d3..cd59c831e6 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -321,7 +321,7 @@ void Foam::MULES::limiter
         const scalarField& phiBDPf = phiBDBf[patchi];
         const scalarField& phiCorrPf = phiCorrBf[patchi];
 
-        const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
+        const labelUList& pFaceCells = mesh.boundary()[patchi].faceCells();
 
         if (psiPf.coupled())
         {
@@ -469,7 +469,7 @@ void Foam::MULES::limiter
             scalarField& lambdaPf = lambdaBf[patchi];
             const scalarField& phiCorrfPf = phiCorrBf[patchi];
 
-            const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
+            const labelUList& pFaceCells = mesh.boundary()[patchi].faceCells();
 
             forAll(lambdaPf, pFacei)
             {
@@ -542,7 +542,7 @@ void Foam::MULES::limiter
             }
             else if (psiPf.coupled())
             {
-                const labelList& pFaceCells =
+                const labelUList& pFaceCells =
                     mesh.boundary()[patchi].faceCells();
 
                 forAll(lambdaPf, pFacei)
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
index e26f61466b..e6871a0bb3 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
@@ -44,7 +44,7 @@ void Foam::pointMVCWeight::calcWeights
 (
     const Map<label>& toLocal,
     const face& f,
-    const DynamicList<point>& u,
+    const UList<point>& u,
     const scalarField& dist,
     scalarField& weights
 ) const
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.H b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.H
index f2abe5a210..220e6baa39 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.H
@@ -86,7 +86,7 @@ protected:
         (
             const Map<label>& toLocal,
             const face& f,
-            const DynamicList<point>& u,
+            const UList<point>& u,
             const scalarField& dist,
             scalarField& weights
         ) const;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index 7848088c17..ac5e0b67e1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -61,8 +61,8 @@ Foam::linearUpwind<Type>::correction
 
     const surfaceScalarField& faceFlux = this->faceFlux_;
 
-    const labelList& owner = mesh.owner();
-    const labelList& neighbour = mesh.neighbour();
+    const auto& owner = mesh.owner();
+    const auto& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -172,8 +172,8 @@ Foam::linearUpwind<Foam::vector>::correction
 
     const surfaceScalarField& faceFlux = this->faceFlux_;
 
-    const labelList& owner = mesh.owner();
-    const labelList& neighbour = mesh.neighbour();
+    const auto& owner = mesh.owner();
+    const auto& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
index 48439fe740..f53be64e1b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
@@ -64,8 +64,8 @@ Foam::linearUpwindV<Type>::correction
     const surfaceScalarField& faceFlux = this->faceFlux_;
     const surfaceScalarField& w = mesh.weights();
 
-    const labelList& own = mesh.owner();
-    const labelList& nei = mesh.neighbour();
+    const auto& own = mesh.owner();
+    const auto& nei = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index 381ab0cc03..65f7a49cb1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -154,17 +154,14 @@ public:
                     (vf.boundaryField()[patchi])
                 )
                 {
-                    const labelList& pFaceCells =
-                        mesh_.boundary()[patchi].faceCells();
-
-                    forAll(pFaceCells, pFacei)
+                    for
+                    (
+                        const label celli
+                      : mesh_.boundary()[patchi].faceCells()
+                    )
                     {
-                        const cell& pFaceCell = cells[pFaceCells[pFacei]];
-
-                        forAll(pFaceCell, fi)
+                        for (const label facei : cells[celli])
                         {
-                            label facei = pFaceCell[fi];
-
                             if (mesh_.isInternalFace(facei))
                             {
                                 // Apply upwind differencing
@@ -213,17 +210,14 @@ public:
                             (vf.boundaryField()[patchi])
                     )
                     {
-                        const labelList& pFaceCells =
-                            mesh_.boundary()[patchi].faceCells();
-
-                        forAll(pFaceCells, pFacei)
+                        for
+                        (
+                            const label celli
+                          : mesh_.boundary()[patchi].faceCells()
+                        )
                         {
-                            const cell& pFaceCell = cells[pFaceCells[pFacei]];
-
-                            forAll(pFaceCell, fi)
+                            for (const label facei : cells[celli])
                             {
-                                label facei = pFaceCell[fi];
-
                                 if (mesh_.isInternalFace(facei))
                                 {
                                     // Remove correction
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
index 6d8cad97f7..40b8b70111 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
@@ -56,8 +56,8 @@ correction
     const pointField& C = mesh.C();
     const faceList& faces = mesh.faces();
     const scalarField& w = mesh.weights();
-    const labelList& owner = mesh.owner();
-    const labelList& neighbour = mesh.neighbour();
+    const auto& owner = mesh.owner();
+    const auto& neighbour = mesh.neighbour();
 
     forAll(sfCorr, facei)
     {
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
index 092969850f..65ff24101f 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@@ -162,7 +162,7 @@ void Foam::functionObjects::fieldMinMax::calcMinMaxFieldType
         {
             const vectorField& Cfp = CfBoundary[patchi];
 
-            const labelList& faceCells =
+            const labelUList& faceCells =
                 fieldBoundary[patchi].patch().faceCells();
 
             minMaxIds = findMinMax(fp);
diff --git a/src/fvOptions/cellSetOption/cellSetOption.C b/src/fvOptions/cellSetOption/cellSetOption.C
index b5117ada94..8b484a7775 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.C
+++ b/src/fvOptions/cellSetOption/cellSetOption.C
@@ -314,7 +314,7 @@ void Foam::fv::cellSetOption::setCellSelection()
         {
             labelHashSet selectedCells;
             const cellCellStencilObject& overlap = Stencil::New(mesh_);
-            const labelList& cellTypes = overlap.cellTypes();
+            const labelUList& cellTypes = overlap.cellTypes();
             forAll(cellTypes, celli)
             {
                 if (cellTypes[celli] == cellCellStencil::POROUS)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 2dbed1a87b..4d631f7efc 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -436,7 +436,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
 template<class CloudType>
 bool Foam::PairCollision<CloudType>::duplicatePointInList
 (
-    const DynamicList<point>& existingPoints,
+    const UList<point>& existingPoints,
     const point& pointToTest,
     scalar duplicateRangeSqr
 ) const
@@ -456,7 +456,7 @@ bool Foam::PairCollision<CloudType>::duplicatePointInList
 template<class CloudType>
 bool Foam::PairCollision<CloudType>::duplicatePointInList
 (
-    const DynamicList<point>& existingPoints,
+    const UList<point>& existingPoints,
     const point& pointToTest,
     const scalarList& duplicateRangeSqr
 ) const
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
index a5c2af2de3..acb9e05754 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
@@ -111,14 +111,14 @@ class PairCollision
 
         bool duplicatePointInList
         (
-            const DynamicList<point>& existingPoints,
+            const UList<point>& existingPoints,
             const point& pointToTest,
             scalar duplicateRangeSqr
         ) const;
 
         bool duplicatePointInList
         (
-            const DynamicList<point>& existingPoints,
+            const UList<point>& existingPoints,
             const point& pointToTest,
             const scalarList& duplicateRangeSqr
         ) const;
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
index 8e2a817dab..279bf2e807 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
@@ -136,7 +136,7 @@ inline Foam::scalar Foam::SprayCloud<CloudType>::penetration
             const SortList<scalar> sortedDist(dist);
 
             const scalar mLimit = fraction*mTotal;
-            const labelList& indices = sortedDist.indices();
+            const labelUList& indices = sortedDist.indices();
 
             if (mLimit > (mTotal - mass[indices.last()]))
             {
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
index baa9e9ecad..199fe05b86 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
@@ -163,7 +163,7 @@ Foam::faceList Foam::blockMesh::createPatchFaces
 {
     const blockList& blocks = *this;
 
-    labelList blockLabels = patchTopologyFaces.polyPatch::faceCells();
+    const labelUList& blockLabels = patchTopologyFaces.polyPatch::faceCells();
 
     label nFaces = 0;
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 5e3bafccad..a0f40a2158 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -288,8 +288,8 @@ void Foam::meshRefinement::calcNeighbourData
 void Foam::meshRefinement::calcCellCellRays
 (
     const pointField& neiCc,
-    const labelList& neiLevel,
-    const labelList& testFaces,
+    const labelUList& neiLevel,
+    const labelUList& testFaces,
     pointField& start,
     pointField& end,
     labelList& minLevel
@@ -358,7 +358,7 @@ void Foam::meshRefinement::calcCellCellRays
 }
 
 
-void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
+void Foam::meshRefinement::updateIntersections(const labelUList& changedFaces)
 {
     // Stats on edges to test. Count proc faces only once.
     bitSet isMasterFace(syncTools::getMasterFaces(mesh_));
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index cc87edc762..26bd899f03 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -259,8 +259,8 @@ private:
         void calcCellCellRays
         (
             const pointField& neiCc,
-            const labelList& neiLevel,
-            const labelList& testFaces,
+            const labelUList& neiLevel,
+            const labelUList& testFaces,
             pointField& start,
             pointField& end,
             labelList& minLevel
@@ -1589,7 +1589,7 @@ public:
             void selectSeparatedCoupledFaces(boolList&) const;
 
             //- Find any intersection of surface. Store in surfaceIndex_.
-            void updateIntersections(const labelList& changedFaces);
+            void updateIntersections(const labelUList& changedFaces);
 
             //- Calculate nearest intersection for selected mesh faces
             void nearestIntersection
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 181a588f87..48ddfd48cf 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -3097,7 +3097,7 @@ void Foam::snappyLayerDriver::printLayerData
         label sumSize = pp.size();
 
         // Number of layers
-        const labelList& faceCells = pp.faceCells();
+        const labelUList& faceCells = pp.faceCells();
         label sumNLayers = 0;
         forAll(faceCells, i)
         {
@@ -3265,7 +3265,7 @@ bool Foam::snappyLayerDriver::writeLayerData
             {
                 label patchi = patchIDs[i];
                 const polyPatch& pp = pbm[patchi];
-                const labelList& faceCells = pp.faceCells();
+                const labelUList& faceCells = pp.faceCells();
                 scalarField pfld(faceCells.size());
                 forAll(faceCells, i)
                 {
@@ -5536,9 +5536,9 @@ void Foam::snappyLayerDriver::doLayers
                 if (numLayers[patchi] > 0)
                 {
                     const polyPatch& pp = mesh.boundaryMesh()[patchi];
-                    forAll(pp.faceCells(), i)
+                    for (const label celli : pp.faceCells())
                     {
-                        cellWeights[pp.faceCells()[i]] += numLayers[patchi];
+                        cellWeights[celli] += numLayers[patchi];
                     }
                 }
             }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
index 0ed56c89a3..eec7f933a8 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
@@ -327,8 +327,8 @@ class snappySnapDriver
                 ) const;
                 void correctAttraction
                 (
-                    const DynamicList<point>& surfacePoints,
-                    const DynamicList<label>& surfaceCounts,
+                    const UList<point>& surfacePoints,
+                    const UList<label>& surfaceCounts,
                     const point& edgePt,
                     const vector& edgeNormal,   // normalised normal
                     const point& pt,
@@ -504,7 +504,7 @@ class snappySnapDriver
                 (
                     const point& pt,
                     const labelList& pfPatchID,
-                    const DynamicList<vector>& surfaceNormals,
+                    const UList<vector>& surfaceNormals,
                     const labelList& faceToNormalBin
                 ) const;
 
@@ -513,7 +513,7 @@ class snappySnapDriver
                 (
                     const scalar featureCos,
                     const vector& faceSurfaceNormal,
-                    const DynamicList<vector>& surfaceNormals
+                    const UList<vector>& surfaceNormals
                 ) const;
 
                 //- Determine attraction and constraints for single point
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index b4aaa38fa3..6f2174af82 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -757,8 +757,8 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
 // and if so attracts the point to that non-dominant plane.
 void Foam::snappySnapDriver::correctAttraction
 (
-    const DynamicList<point>& surfacePoints,
-    const DynamicList<label>& surfaceCounts,
+    const UList<point>& surfacePoints,
+    const UList<label>& surfaceCounts,
     const point& edgePt,
     const vector& edgeNormal,       // normalised normal
     const point& pt,
@@ -820,7 +820,7 @@ Foam::label Foam::snappySnapDriver::findNormal
 (
     const scalar featureCos,
     const vector& n,
-    const DynamicList<vector>& surfaceNormals
+    const UList<vector>& surfaceNormals
 ) const
 {
     label index = -1;
@@ -853,7 +853,7 @@ Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
 (
     const point& pt,
     const labelList& patchIDs,
-    const DynamicList<vector>& surfaceNormals,
+    const UList<vector>& surfaceNormals,
     const labelList& faceToNormalBin
 ) const
 {
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.C
index 9cfb1c30c6..ae54edff67 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.C
@@ -364,7 +364,7 @@ void Foam::advancingFrontAMI::appendNbrFaces
 (
     const label facei,
     const primitivePatch& patch,
-    const DynamicList<label>& visitedFaces,
+    const labelUList& visitedFaces,
     DynamicList<label>& faceIDs
 ) const
 {
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.H
index 368d61fe2a..768ec7758f 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.H
@@ -211,7 +211,7 @@ protected:
             (
                 const label facei,
                 const primitivePatch& patch,
-                const DynamicList<label>& visitedFaces,
+                const labelUList& visitedFaces,
                 DynamicList<label>& faceIDs
             ) const;
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C
index c985cdc589..c62cc19c57 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C
@@ -63,7 +63,7 @@ namespace Foam
         // Write out triangulated surfaces as OBJ files
         OBJstream srcTriObj("srcTris_" + Foam::name(nAMI) + ".obj");
         const pointField& srcPts = src.points();
-        for (const DynamicList<face>& faces : srcTris_)
+        for (const auto& faces : srcTris_)
         {
             for (const face& f : faces)
             {
@@ -76,7 +76,7 @@ namespace Foam
 
         OBJstream tgtTriObj("tgtTris_" + Foam::name(nAMI) + ".obj");
         const pointField& tgtPts = tgt.points();
-        for (const DynamicList<face>& faces : tgtTris_)
+        for (const auto& faces : tgtTris_)
         {
             for (const face& f : faces)
             {
@@ -258,7 +258,7 @@ bool Foam::faceAreaWeightAMI::setNextFaces
     label& tgtFacei,
     const bitSet& mapFlag,
     labelList& seedFaces,
-    const DynamicList<label>& visitedFaces,
+    const labelUList& visitedFaces,
     const bool errorOnNotFound
 ) const
 {
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.H
index 5c3d61dbd8..6eac3e4133 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.H
@@ -118,7 +118,7 @@ protected:
                 label& tgtFacei,
                 const bitSet& mapFlag,
                 labelList& seedFaces,
-                const DynamicList<label>& visitedFaces,
+                const labelUList& visitedFaces,
                 const bool errorOnNotFound = true
             ) const;
 
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C
index 6a68693944..0d1cc1f1d7 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C
@@ -202,7 +202,7 @@ void Foam::cyclicACMIGAMGInterfaceField::initInterfaceMatrixUpdate
         }
 
         // Get neighbouring field
-        const labelList& nbrFaceCells =
+        const labelUList& nbrFaceCells =
             lduAddr.patchAddr(cyclicACMIInterface_.neighbPatchID());
 
         solveScalarField pnf(psiInternal, nbrFaceCells);
@@ -315,7 +315,7 @@ void Foam::cyclicACMIGAMGInterfaceField::updateInterfaceMatrix
     else
     {
         // Get neighbouring field
-        const labelList& nbrFaceCells =
+        const labelUList& nbrFaceCells =
             lduAddr.patchAddr(cyclicACMIInterface_.neighbPatchID());
 
         solveScalarField pnf(psiInternal, nbrFaceCells);
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
index da63d6a0e9..ee07f27441 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
@@ -203,7 +203,7 @@ void Foam::cyclicAMIGAMGInterfaceField::initInterfaceMatrixUpdate
         }
 
         // Get neighbouring field
-        const labelList& nbrFaceCells =
+        const labelUList& nbrFaceCells =
             lduAddr.patchAddr(cyclicAMIInterface_.neighbPatchID());
 
         solveScalarField pnf(psiInternal, nbrFaceCells);
@@ -329,7 +329,7 @@ void Foam::cyclicAMIGAMGInterfaceField::updateInterfaceMatrix
     else
     {
         // Get neighbouring field
-        const labelList& nbrFaceCells =
+        const labelUList& nbrFaceCells =
             lduAddr.patchAddr(cyclicAMIInterface_.neighbPatchID());
 
         solveScalarField work(psiInternal, nbrFaceCells);
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
index 7a45177352..8c2cba4148 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
@@ -188,10 +188,16 @@ public:
         inline bool cacheTriangulation() const;
 
         //- Const access to the triangulation
-        inline const DynamicList<triPoints> triangles() const;
+        const DynamicList<triPoints>& triangles() const noexcept
+        {
+            return triangles_;
+        }
 
         //- Non-const access to the triangulation
-        inline DynamicList<triPoints>& triangles();
+        DynamicList<triPoints>& triangles() noexcept
+        {
+            return triangles_;
+        }
 
         //- Decompose face into triangle fan
         static inline void triangleFan
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H
index 7541b14141..e78cf0281f 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H
@@ -121,17 +121,4 @@ bool Foam::faceAreaIntersect::cacheTriangulation() const
 }
 
 
-const Foam::DynamicList<Foam::triPoints>
-Foam::faceAreaIntersect::triangles() const
-{
-    return triangles_;
-}
-
-
-Foam::DynamicList<Foam::triPoints>& Foam::faceAreaIntersect::triangles()
-{
-    return triangles_;
-}
-
-
 // ************************************************************************* //
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
index d7f399de4f..9b100aaa45 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
@@ -54,7 +54,7 @@ adjointBoundaryCondition<Type>::computePatchGrad(word name)
     auto tresGrad = tmp<Field<GradType>>::New(patch_.size(), Zero);
     auto& resGrad = tresGrad.ref();
 
-    const labelList& faceCells = patch_.faceCells();
+    const labelUList& faceCells = patch_.faceCells();
     const fvMesh& mesh = patch_.boundaryMesh().mesh();
     const cellList& cells = mesh.cells();
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
index 597cc61d62..8c37685b96 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
@@ -101,7 +101,7 @@ void Foam::adjointOutletVelocityFluxFvPatchVectorField::manipulateMatrix
     );
     vectorField& source = matrix.source();
     const vectorField& Sf = patch().Sf();
-    const labelList& faceCells = patch().faceCells();
+    const labelUList& faceCells = patch().faceCells();
     const scalarField& magSf = patch().magSf();
     tmp<vectorField> tvelocitySource(boundaryContrPtr_->velocitySource());
     const vectorField& velocitySource = tvelocitySource();
diff --git a/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C b/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
index 86f201430f..51f7f27f5f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
+++ b/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
@@ -63,8 +63,8 @@ Foam::linearUpwindNormal<Type>::correction
 
     const surfaceScalarField& faceFlux = this->faceFlux_;
 
-    const labelList& owner = mesh.owner();
-    const labelList& neighbour = mesh.neighbour();
+    const auto& owner = mesh.owner();
+    const auto& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/topODesignVariables.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/topODesignVariables.C
index 6af1794f14..f4263cdbfa 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/topODesignVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/topODesignVariables.C
@@ -268,11 +268,7 @@ void Foam::topODesignVariables::initialize()
         {
             if (isA<wallFvPatch>(patch))
             {
-                const labelList& faceCells = patch.faceCells();
-                forAll(faceCells, cI)
-                {
-                    alpha[faceCells[cI]] = 1.;
-                }
+                UIndirectList<scalar>(alpha, patch.faceCells()) = 1;
             }
         }
     }
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C
index 72bf06a488..3ca8d35f8f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C
@@ -907,7 +907,7 @@ tmp<volScalarField> adjointSpalartAllmaras::distanceSensitivities()
             const scalarField rt(tsource() & tf);
             const scalarField Uap_t(Uap & tf);
 
-            const labelList& faceCells = patch.faceCells();
+            const labelUList& faceCells = patch.faceCells();
             forAll(faceCells, faceI)
             {
                 label cellI = faceCells[faceI];
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
index e04e223705..8ec6ae59d7 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
@@ -142,7 +142,7 @@ tmp<volScalarField> adjointkOmegaSST::zeroFirstCell()
         if (isA<omegaWallFunctionFvPatchScalarField>(omegab))
         {
             const label patchi = patch.index();
-            const labelList& faceCells = patch.faceCells();
+            const labelUList& faceCells = patch.faceCells();
             fvPatchScalarField& bf = zeroFirstCell.boundaryFieldRef()[patchi];
             forAll(faceCells, faceI)
             {
@@ -180,7 +180,7 @@ tmp<volScalarField> adjointkOmegaSST::dR_dnut()
     {
         const fvPatch& patch = mesh_.boundary()[pI];
         const fvPatchScalarField& nutb = nutRef().boundaryField()[pI];
-        const labelList& faceCells = patch.faceCells();
+        const labelUList& faceCells = patch.faceCells();
         if (isA<nutkWallFunctionFvPatchScalarField>(nutb))
         {
             fvPatchScalarField& bf = dRdnut.boundaryFieldRef()[pI];
@@ -716,7 +716,7 @@ tmp<volScalarField> adjointkOmegaSST::dNutdbMult
                 dev2(gradU_.boundaryField()[pI].patchInternalField())
             );
             const vectorField& Sfb = Sf.boundaryField()[pI];
-            const labelList& faceCells = mesh_.boundary()[pI].faceCells();
+            const labelUList& faceCells = mesh_.boundary()[pI].faceCells();
             forAll(faceCells, fI)
             {
                 const label celli = faceCells[fI];
@@ -969,7 +969,7 @@ void adjointkOmegaSST::addWallFunctionTerms
 
             const scalar Cmu25 = pow025(Cmu);
 
-            const labelList& faceCells = patch.faceCells();
+            const labelUList& faceCells = patch.faceCells();
             const fvPatchScalarField& dR_dnutw =
                 dR_dnut.boundaryField()[patchi];
             const fvPatchScalarField& omegaw = omega.boundaryField()[patchi];
@@ -1845,7 +1845,7 @@ tmp<fvVectorMatrix> adjointkOmegaSST::divDevReff(volVectorField& Ua) const
             const fvPatchScalarField& nuEffb = nuEff.boundaryField()[pI];
             const vectorField nf = mesh_.boundary()[pI].nf();
             const vectorField Uai = Ua.boundaryField()[pI].patchInternalField();
-            const labelList& faceCells = mesh_.boundary()[pI].faceCells();
+            const labelUList& faceCells = mesh_.boundary()[pI].faceCells();
             const vectorField& Sfb = Sf.boundaryField()[pI];
 
             forAll(faceCells, fI)
@@ -1989,7 +1989,7 @@ tmp<volVectorField> adjointkOmegaSST::adjointMeanFlowSource()
             const scalar kappa = wallCoeffs.kappa();
             const scalar Cmu25 = pow025(Cmu);
 
-            const labelList& faceCells = patch.faceCells();
+            const labelUList& faceCells = patch.faceCells();
 
             const fvPatchVectorField& Uw =
                 primalVars_.U().boundaryField()[patchi];
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/kaqRWallFunction/kaqRWallFunctionFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/kaqRWallFunction/kaqRWallFunctionFvPatchScalarField.C
index 0057310ad0..8a9cd5eb44 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/kaqRWallFunction/kaqRWallFunctionFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/kaqRWallFunction/kaqRWallFunctionFvPatchScalarField.C
@@ -124,7 +124,7 @@ void Foam::kaqRWallFunctionFvPatchScalarField::manipulateMatrix
 
         const scalar Cmu25 = pow025(Cmu);
 
-        const labelList& faceCells = patch().faceCells();
+        const labelUList& faceCells = patch().faceCells();
         const fvPatchVectorField& Uw = boundaryContrPtr_->Ub();
         const scalarField magGradUw(mag(Uw.snGrad()));
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/waWallFunction/waWallFunctionFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/waWallFunction/waWallFunctionFvPatchScalarField.C
index a3dc8d51c8..6203105c77 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/waWallFunction/waWallFunctionFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/waWallFunction/waWallFunctionFvPatchScalarField.C
@@ -136,7 +136,7 @@ void waWallFunctionFvPatchScalarField::manipulateMatrix
     FieldField<Field, scalar>& internalCoeffs = matrix.internalCoeffs();
     FieldField<Field, scalar>& boundaryCoeffs = matrix.boundaryCoeffs();
     const fvMesh& mesh = patch().boundaryMesh().mesh();
-    const labelList& faceCells = patch().faceCells();
+    const labelUList& faceCells = patch().faceCells();
 
     // Add diag term from the omega expression next to the wall
     for (const label celli : faceCells)
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
index f5f3522932..a19f48171a 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
@@ -423,7 +423,7 @@ void Foam::cellCellStencil::setUpFrontOnOversetPatch
     {
         if (isA<oversetFvPatch>(fvm[patchi]))
         {
-            const labelList& fc = fvm[patchi].faceCells();
+            const labelUList& fc = fvm[patchi].faceCells();
             forAll(fc, i)
             {
                 const label celli = fc[i];
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
index f110df6463..a93838a462 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
@@ -46,7 +46,7 @@ void Foam::cellCellStencil::interpolate
     }
 
     const mapDistribute& map = overlap.cellInterpolationMap();
-    const labelList& cellIDs = overlap.interpolationCells();
+    const labelUList& cellIDs = overlap.interpolationCells();
     const scalarList& factor = overlap.cellInterpolationWeight();
 
     Field<T> work(psi);
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
index 602d31b075..892e2f652f 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
@@ -197,16 +197,15 @@ void Foam::cellCellStencils::cellVolumeWeight::findHoles
             //Pout<< "Proper patch " << fvp.name() << " of type " << fvp.type()
             //    << endl;
 
-            const labelList& fc = fvp.faceCells();
-            forAll(fc, i)
+            for (const label celli : fvp.faceCells())
             {
-                label regionI = cellRegion[fc[i]];
+                label regionI = cellRegion[celli];
 
-                if (cellTypes[fc[i]] != HOLE && regionType[regionI] != 2)
+                if (cellTypes[celli] != HOLE && regionType[regionI] != 2)
                 {
                     //Pout<< "reachable region : " << regionI
-                    //    << " at cell " << mesh.cellCentres()[fc[i]]
-                    //    << " on zone " << zoneID[fc[i]] << endl;
+                    //    << " at cell " << mesh.cellCentres()[celli]
+                    //    << " on zone " << zoneID[celli] << endl;
                     regionType[regionI] = 2;
                 }
             }
@@ -301,7 +300,7 @@ void Foam::cellCellStencils::cellVolumeWeight::markPatchCells
     forAll(pbm, patchI)
     {
         const fvPatch& fvp = pbm[patchI];
-        const labelList& fc = fvp.faceCells();
+        const labelUList& fc = fvp.faceCells();
 
         if (isA<oversetFvPatch>(fvp))
         {
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
index c09703ec54..c416d825d6 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@@ -181,7 +181,7 @@ void Foam::cellCellStencils::inverseDistance::markBoundaries
     forAll(pbm, patchI)
     {
         const fvPatch& fvp = pbm[patchI];
-        const labelList& fc = fvp.faceCells();
+        const labelUList& fc = fvp.faceCells();
 
         if (!fvPatch::constraintType(fvp.type()))
         {
@@ -209,7 +209,7 @@ void Foam::cellCellStencils::inverseDistance::markBoundaries
     forAll(pbm, patchI)
     {
         const fvPatch& fvp = pbm[patchI];
-        const labelList& fc = fvp.faceCells();
+        const labelUList& fc = fvp.faceCells();
 
         if (isA<oversetFvPatch>(fvp))
         {
@@ -1074,12 +1074,11 @@ void Foam::cellCellStencils::inverseDistance::findHoles
         {}
         else if (!fvPatch::constraintType(fvp.type()))
         {
-            const labelList& fc = fvp.faceCells();
-            forAll(fc, i)
+            for (const label celli : fvp.faceCells())
             {
-                label regionI = cellRegion[fc[i]];
+                label regionI = cellRegion[celli];
 
-                if (cellTypes[fc[i]] != HOLE && regionType[regionI] != 2)
+                if (cellTypes[celli] != HOLE && regionType[regionI] != 2)
                 {
                     regionType[regionI] = 2;
                 }
diff --git a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
index 07f3c25436..815d7d701e 100644
--- a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
@@ -77,7 +77,7 @@ bool Foam::cellCellStencils::trackingInverseDistance::markBoundaries
     forAll(pbm, patchi)
     {
         const fvPatch& fvp = pbm[patchi];
-        const labelList& fc = fvp.faceCells();
+        const labelUList& fc = fvp.faceCells();
 
         if (!fvPatch::constraintType(fvp.type()))
         {
@@ -112,7 +112,7 @@ bool Foam::cellCellStencils::trackingInverseDistance::markBoundaries
     forAll(pbm, patchi)
     {
         const fvPatch& fvp = pbm[patchi];
-        const labelList& fc = fvp.faceCells();
+        const labelUList& fc = fvp.faceCells();
 
         if (isA<oversetFvPatch>(fvp))
         {
diff --git a/src/overset/include/setCellMask.H b/src/overset/include/setCellMask.H
index 0e65bd585a..850e87267a 100644
--- a/src/overset/include/setCellMask.H
+++ b/src/overset/include/setCellMask.H
@@ -30,7 +30,7 @@ Description
 
 {
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
+    const labelUList& cellTypes = overlap.cellTypes();
 
     cellMask.primitiveFieldRef() = 1.0;
     forAll(cellMask, cellI)
diff --git a/src/overset/include/setInterpolatedCells.H b/src/overset/include/setInterpolatedCells.H
index 6e42e2c795..d45585ec8e 100644
--- a/src/overset/include/setInterpolatedCells.H
+++ b/src/overset/include/setInterpolatedCells.H
@@ -30,7 +30,7 @@ Description
 
 {
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
+    const labelUList& cellTypes = overlap.cellTypes();
 
     interpolatedCells.primitiveFieldRef() = 1.0;
     forAll(cellMask, cellI)
diff --git a/src/overset/oversetAdjustPhi/oversetAdjustPhi.C b/src/overset/oversetAdjustPhi/oversetAdjustPhi.C
index 4b858ab40c..f98de6d741 100644
--- a/src/overset/oversetAdjustPhi/oversetAdjustPhi.C
+++ b/src/overset/oversetAdjustPhi/oversetAdjustPhi.C
@@ -43,8 +43,8 @@ bool Foam::oversetAdjustPhi
 {
     const fvMesh& mesh = U.mesh();
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
-    const labelList& zoneID = overlap.zoneID();
+    const labelUList& cellTypes = overlap.cellTypes();
+    const labelUList& zoneID = overlap.zoneID();
 
     // Pass1: accumulate all fluxes, calculate correction factor
 
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBase.C b/src/overset/oversetFvMesh/oversetFvMeshBase.C
index 9d8571dc43..08883c1617 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBase.C
+++ b/src/overset/oversetFvMesh/oversetFvMeshBase.C
@@ -359,8 +359,8 @@ bool Foam::oversetFvMeshBase::updateAddressing() const
 
 Foam::scalar Foam::oversetFvMeshBase::cellAverage
 (
-    const labelList& types,
-    const labelList& nbrTypes,
+    const labelUList& types,
+    const labelUList& nbrTypes,
     const scalarField& norm,
     const scalarField& nbrNorm,
     const label celli,
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBase.H b/src/overset/oversetFvMesh/oversetFvMeshBase.H
index 04530c4da5..9f0c2aa227 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBase.H
+++ b/src/overset/oversetFvMesh/oversetFvMeshBase.H
@@ -142,8 +142,8 @@ protected:
         //- Average norm of valid neighbours
         scalar cellAverage
         (
-            const labelList& types,
-            const labelList& nbrTypes,
+            const labelUList& types,
+            const labelUList& nbrTypes,
             const scalarField& norm,
             const scalarField& nbrNorm,
             const label celli,
diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.C b/src/overset/oversetPolyPatch/oversetFvPatchField.C
index 1ab511b730..1d23d779c4 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatchField.C
+++ b/src/overset/oversetPolyPatch/oversetFvPatchField.C
@@ -168,8 +168,8 @@ void Foam::oversetFvPatchField<Type>::storeFringeCoefficients
     const fvMesh& mesh = this->internalField().mesh();
 
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
-    const labelList& zoneID = overlap.zoneID();
+    const labelUList& cellTypes = overlap.cellTypes();
+    const labelUList& zoneID = overlap.zoneID();
     const labelUList& own = mesh.owner();
     const labelUList& nei = mesh.neighbour();
 
@@ -345,8 +345,8 @@ void Foam::oversetFvPatchField<Type>::fringeFlux
     {
         const fvMesh& mesh = this->internalField().mesh();
         const cellCellStencilObject& overlap = Stencil::New(mesh);
-        const labelList& cellTypes = overlap.cellTypes();
-        const labelList& zoneID = overlap.zoneID();
+        const labelUList& cellTypes = overlap.cellTypes();
+        const labelUList& zoneID = overlap.zoneID();
 
         // Check all faces on the outside of interpolated cells
         const labelUList& own = mesh.owner();
@@ -421,8 +421,8 @@ void Foam::oversetFvPatchField<Type>::adjustPsi
     const fvMesh& mesh = this->internalField().mesh();
 
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
-    const labelList& zoneID = overlap.zoneID();
+    const labelUList& cellTypes = overlap.cellTypes();
+    const labelUList& zoneID = overlap.zoneID();
 
     // Pass-1: accumulate all fluxes, calculate correction factor
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
index 445162fcb6..d5cdaa204d 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
@@ -175,7 +175,7 @@ Foam::diameterModels::nucleationModels::wallBoiling::addToNucleationRate
             const scalarField& dmdt = alphatw.dmdt();
             const scalarField& dDep = alphatw.dDeparture();
 
-            const labelList& faceCells = alphatw.patch().faceCells();
+            const labelUList& faceCells = alphatw.patch().faceCells();
 
             dimensionedScalar unitLength("unitLength", dimLength, 1.0);
 
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
index e0b87ac0a9..1969cb88a1 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
@@ -122,7 +122,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R
             const scalarField& dmdt = alphatw.dmdt();
             const scalarField& dDep = alphatw.dDeparture();
 
-            const labelList& faceCells = alphatw.patch().faceCells();
+            const labelUList& faceCells = alphatw.patch().faceCells();
 
             forAll(alphatw, facei)
             {
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index 207d1c0a48..28812ae78b 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -102,7 +102,7 @@ void Foam::regionModels::singleLayerRegion::initialise()
     {
         const label patchi = intCoupledPatchIDs_[i];
         const polyPatch& pp = rbm[patchi];
-        const labelList& fCells = pp.faceCells();
+        const labelUList& fCells = pp.faceCells();
 
         nBoundaryFaces += fCells.size();
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index da3827b43a..ace7e58f91 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -144,7 +144,7 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
     {
         const fvsPatchScalarField& phip = phi.boundaryField()[patchi];
         const fvPatch& pp = phip.patch();
-        const labelList& faceCells = pp.faceCells();
+        const labelUList& faceCells = pp.faceCells();
         const vectorField nf(pp.nf());
         forAll(phip, i)
         {
@@ -166,7 +166,7 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
         {
             const scalarField& phip = phi.boundaryField()[patchi];
             const vectorField nf(pbm[patchi].nf());
-            const labelList& faceCells = pbm[patchi].faceCells();
+            const labelUList& faceCells = pbm[patchi].faceCells();
             const label sizeBy2 = pbm[patchi].size()/2;
 
             for (label face0=0; face0<sizeBy2; face0++)
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
index 24acdaf03b..3eb24a5ff3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
@@ -115,12 +115,11 @@ void patchInjection::correct
     {
         label patchi = patchIDs_[pidi];
         const polyPatch& pp = pbm[patchi];
-        const labelList& faceCells = pp.faceCells();
 
         // Accumulate the total mass removed from patch
         scalar dMassPatch = 0;
 
-        for (const label celli : faceCells)
+        for (const label celli : pp.faceCells())
         {
             scalar ddelta = max(0.0, delta[celli] - deltaStable_);
             scalar dMass = ddelta*rho[celli]*magSf[celli];
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
index 4e4a426491..474ef3f3df 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
@@ -236,7 +236,7 @@ void Foam::cellVolumeWeightMethod::setNextCells
     label& tgtCelli,
     const labelList& srcCellIDs,
     const boolList& mapFlag,
-    const DynamicList<label>& visitedCells,
+    const labelUList& visitedCells,
     labelList& seedCells
 ) const
 {
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
index 44176deefd..957015b15c 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
@@ -91,7 +91,7 @@ protected:
             label& tgtCelli,
             const labelList& srcCellIDs,
             const boolList& mapFlag,
-            const DynamicList<label>& visitedCells,
+            const labelUList& visitedCells,
             labelList& seedCells
         ) const;
 
diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C
index f1cd0e78e5..c62d149665 100644
--- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C
@@ -157,7 +157,7 @@ void Foam::meshToMeshMethod::appendNbrCells
 (
     const label celli,
     const polyMesh& mesh,
-    const DynamicList<label>& visitedCells,
+    const labelUList& visitedCells,
     DynamicList<label>& nbrCellIDs
 ) const
 {
diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
index 28f82d0f27..d90d9e538c 100644
--- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
@@ -100,7 +100,7 @@ protected:
         (
             const label tgtCelli,
             const polyMesh& mesh,
-            const DynamicList<label>& visitedTgtCells,
+            const labelUList& visitedTgtCells,
             DynamicList<label>& nbrTgtCellIDs
         ) const;
 
diff --git a/src/sampling/surface/isoSurface/isoSurfaceCell.H b/src/sampling/surface/isoSurface/isoSurfaceCell.H
index 56ef23d34b..2e4f37bd76 100644
--- a/src/sampling/surface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/surface/isoSurface/isoSurfaceCell.H
@@ -163,7 +163,7 @@ class isoSurfaceCell
         template<class Type>
         Type generatePoint
         (
-            const DynamicList<Type>& snappedPoints,
+            const UList<Type>& snappedPoints,
             const scalar s0,
             const Type& p0,
             const label p0Index,
@@ -175,7 +175,7 @@ class isoSurfaceCell
         template<class Type>
         void generateTriPoints
         (
-            const DynamicList<Type>& snapped,
+            const UList<Type>& snapped,
             const scalar s0,
             const Type& p0,
             const label p0Index,
@@ -200,7 +200,7 @@ class isoSurfaceCell
             const Field<Type>& cCoords,
             const Field<Type>& pCoords,
 
-            const DynamicList<Type>& snappedPoints,
+            const UList<Type>& snappedPoints,
             const labelList& snappedCc,
             const labelList& snappedPoint,
 
diff --git a/src/sampling/surface/isoSurface/isoSurfaceCellTemplates.C b/src/sampling/surface/isoSurface/isoSurfaceCellTemplates.C
index af1e5d5924..9082399494 100644
--- a/src/sampling/surface/isoSurface/isoSurfaceCellTemplates.C
+++ b/src/sampling/surface/isoSurface/isoSurfaceCellTemplates.C
@@ -36,7 +36,7 @@ License
 template<class Type>
 Type Foam::isoSurfaceCell::generatePoint
 (
-    const DynamicList<Type>& snappedPoints,
+    const UList<Type>& snappedPoints,
 
     const scalar s0,
     const Type& p0,
@@ -78,7 +78,7 @@ Type Foam::isoSurfaceCell::generatePoint
 template<class Type>
 void Foam::isoSurfaceCell::generateTriPoints
 (
-    const DynamicList<Type>& snapped,
+    const UList<Type>& snapped,
 
     const scalar s0,
     const Type& p0,
@@ -273,7 +273,7 @@ void Foam::isoSurfaceCell::generateTriPoints
     const Field<Type>& cCoords,
     const Field<Type>& pCoords,
 
-    const DynamicList<Type>& snappedPoints,
+    const UList<Type>& snappedPoints,
     const labelList& snappedCc,
     const labelList& snappedPoint,
 
diff --git a/src/sampling/surface/isoSurface/isoSurfacePoint.H b/src/sampling/surface/isoSurface/isoSurfacePoint.H
index c11241d228..7421843ca7 100644
--- a/src/sampling/surface/isoSurface/isoSurfacePoint.H
+++ b/src/sampling/surface/isoSurface/isoSurfacePoint.H
@@ -259,7 +259,7 @@ class isoSurfacePoint
             const VolumeField<Type>& cCoords,
             const Field<Type>& pCoords,
 
-            const DynamicList<Type>& snappedPoints,
+            const UList<Type>& snappedPoints,
             const labelList& snappedCc,
             const labelList& snappedPoint,
             const label facei,
@@ -282,7 +282,7 @@ class isoSurfacePoint
             const VolumeField<Type>& cCoords,
             const Field<Type>& pCoords,
 
-            const DynamicList<Type>& snappedPoints,
+            const UList<Type>& snappedPoints,
             const labelList& snappedCc,
             const labelList& snappedPoint,
 
@@ -298,7 +298,7 @@ class isoSurfacePoint
             const labelList& interpolatedPoints,
             const List<FixedList<label, 3>>& interpolatedOldPoints,
             const List<FixedList<scalar, 3>>& interpolationWeights,
-            const DynamicList<Type>& unmergedValues
+            const UList<Type>& unmergedValues
         );
 
         triSurface stitchTriPoints
diff --git a/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C b/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
index 06d90de29e..37054e3566 100644
--- a/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
+++ b/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
@@ -438,7 +438,7 @@ Foam::label Foam::isoSurfacePoint::generateFaceTriPoints
     const VolumeField<Type>& cCoords,
     const Field<Type>& pCoords,
 
-    const DynamicList<Type>& snappedPoints,
+    const UList<Type>& snappedPoints,
     const labelList& snappedCc,
     const labelList& snappedPoint,
     const label facei,
@@ -521,7 +521,7 @@ void Foam::isoSurfacePoint::generateTriPoints
     const VolumeField<Type>& cCoords,
     const Field<Type>& pCoords,
 
-    const DynamicList<Type>& snappedPoints,
+    const UList<Type>& snappedPoints,
     const labelList& snappedCc,
     const labelList& snappedPoint,
 
@@ -738,7 +738,7 @@ Foam::isoSurfacePoint::interpolate
     const labelList& interpolatedPoints,
     const List<FixedList<label, 3>>& interpolatedOldPoints,
     const List<FixedList<scalar, 3>>& interpolationWeights,
-    const DynamicList<Type>& unmergedValues
+    const UList<Type>& unmergedValues
 )
 {
     // One value per point
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
index 503a7489ce..15f2c414f8 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
@@ -281,7 +281,7 @@ void Foam::radiation::solarLoad::updateSkyDiffusiveRadiation
                 const scalarField& sf = mesh_.magSf().boundaryField()[patchID];
 
                 const vectorField n = pp.faceNormals();
-                const labelList& cellids = pp.faceCells();
+                const labelUList& cellids = pp.faceCells();
 
                 // Calculate diffusive radiance
                 // contribution from sky and ground
@@ -326,7 +326,7 @@ void Foam::radiation::solarLoad::updateSkyDiffusiveRadiation
                 const polyPatch& pp = patches[patchID];
                 const scalarField& sf = mesh_.magSf().boundaryField()[patchID];
 
-                const labelList& cellids = pp.faceCells();
+                const labelUList& cellids = pp.faceCells();
                 forAll(pp, facei)
                 {
                     const label celli = cellids[facei];
@@ -697,7 +697,7 @@ void Foam::radiation::solarLoad::calculateQdiff
         else
         {
             const polyPatch& pp = patches[patchID];
-            const labelList& cellids = pp.faceCells();
+            const labelUList& cellids = pp.faceCells();
             const scalarField& sf = mesh_.magSf().boundaryField()[patchID];
             forAll(pp, facei)
             {
diff --git a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
index d34604b256..110f3127ba 100644
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
@@ -266,7 +266,7 @@ void Foam::isoAdvection::timeIntegratedFlux()
 
     // Storage for isoFace points. Only used if writeIsoFacesToFile_
     DynamicList<List<point>> isoFacePts;
-    const DynamicField<label>& interfaceLabels = surf_->interfaceLabels();
+    const labelUList& interfaceLabels = surf_->interfaceLabels();
 
     // Calculating isoface normal velocity
     scalarField Un0(interfaceLabels.size());
@@ -678,7 +678,7 @@ void Foam::isoAdvection::writeSurfaceCells() const
 
 void Foam::isoAdvection::writeIsoFaces
 (
-    const DynamicList<List<point>>& faces
+    const UList<List<point>>& faces
 ) const
 {
     if (!writeIsoFacesToFile_ || !mesh_.time().writeTime()) return;
@@ -694,7 +694,7 @@ void Foam::isoAdvection::writeIsoFaces
     if (Pstream::parRun())
     {
         // Collect points from all the processors
-        List<DynamicList<List<point>>> allProcFaces(Pstream::nProcs());
+        List<List<List<point>>> allProcFaces(Pstream::nProcs());
         allProcFaces[Pstream::myProcNo()] = faces;
         Pstream::gatherList(allProcFaces);
 
@@ -705,13 +705,9 @@ void Foam::isoAdvection::writeIsoFaces
             Info<< nl << "isoAdvection: writing iso faces to file: "
                 << os.name() << nl << endl;
 
-            for
-            (
-                const DynamicList<List<point>>& procFacePts
-              : allProcFaces
-            )
+            for (const auto& procFacePts : allProcFaces)
             {
-                for (const List<point>& facePts : procFacePts)
+                for (const auto& facePts : procFacePts)
                 {
                     os.writeFace(facePts, false);
                 }
@@ -725,7 +721,7 @@ void Foam::isoAdvection::writeIsoFaces
         Info<< nl << "isoAdvection: writing iso faces to file: "
             << os.name() << nl << endl;
 
-        for (const List<point>& facePts : faces)
+        for (const auto& facePts : faces)
         {
             os.writeFace(facePts, false);
         }
diff --git a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.H b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.H
index f741963733..e74589d9d2 100644
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.H
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.H
@@ -400,10 +400,7 @@ public:
             }
 
             //- Write isoface points to .obj file
-            void writeIsoFaces
-            (
-                const DynamicList<List<point>>& isoFacePts
-            ) const;
+            void writeIsoFaces(const UList<List<point>>& isoFacePts) const;
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //