diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
index a6d3a3f6b2..280d7d6d55 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
@@ -325,8 +325,8 @@ void Foam::MULES::limiter
 
     const fvMesh& mesh = psi.mesh();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighb = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighb = mesh.neighbour();
     tmp<volScalarField::DimensionedInternalField> tVsc = mesh.Vsc();
     const scalarField& V = tVsc();
 
diff --git a/applications/test/PackedList4/PackedListTest4.C b/applications/test/PackedList4/PackedListTest4.C
index a500de01d3..27ad9d96c6 100644
--- a/applications/test/PackedList4/PackedListTest4.C
+++ b/applications/test/PackedList4/PackedListTest4.C
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
         (list3 |= list2).printBits(Info);
     }
 
-    Info<< "\noperator|= with UList<label>\n";
+    Info<< "\noperator|= with labelUList\n";
     {
         PackedBoolList list3 = list1;
         (list3 |= list2Labels).printBits(Info);
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
         (list3 += list2).printBits(Info);
     }
 
-    Info<< "\noperator+= with UList<label>\n";
+    Info<< "\noperator+= with labelUList\n";
     {
         PackedBoolList list3 = list1;
         (list3 += list2Labels).printBits(Info);
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
         (list3 -= list2).printBits(Info);
     }
 
-    Info<< "\noperator-= with UList<label>\n";
+    Info<< "\noperator-= with labelUList\n";
     {
         PackedBoolList list3 = list1;
         (list3 -= list2Labels).printBits(Info);
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
index d66c7bc110..32218f79a6 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
@@ -124,8 +124,8 @@ void Foam::fluentFvMesh::writeFluentMesh() const
     fluentMeshFile
         << "))" << std::endl << std::endl;
 
-    const unallocLabelList& own = owner();
-    const unallocLabelList& nei = neighbour();
+    const labelUList& own = owner();
+    const labelUList& nei = neighbour();
 
     const faceList& fcs = faces();
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 09fb5484e9..1d926ed93d 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -138,7 +138,7 @@ Foam::label Foam::checkTopology
         {
             if (patches[patchI].coupled())
             {
-                const unallocLabelList& owners = patches[patchI].faceCells();
+                const labelUList& owners = patches[patchI].faceCells();
 
                 forAll(owners, i)
                 {
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index c40a2c7aa9..17e1b2c0cb 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -128,7 +128,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     // Distribute internal faces
     labelListList newCellFaces(oldCells.size());
 
-    const unallocLabelList& oldOwnerStart = lduAddr().ownerStartAddr();
+    const labelUList& oldOwnerStart = lduAddr().ownerStartAddr();
 
     forAll(newCellFaces, cellI)
     {
@@ -168,7 +168,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
         curInsBouFace = false;
 
         // Get faceCells for face insertion
-        const unallocLabelList& curFaceCells = curPatch.faceCells();
+        const labelUList& curFaceCells = curPatch.faceCells();
         const label curStart = curPatch.start();
 
         forAll(curPatch, faceI)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 5894a1e1c4..5e4433c6e7 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -164,7 +164,7 @@ void Foam::domainDecomposition::decomposeMesh()
             // Normal patch. Add faces to processor where the cell
             // next to the face lives
 
-            const unallocLabelList& patchFaceCells =
+            const labelUList& patchFaceCells =
                 patches[patchi].faceCells();
 
             forAll(patchFaceCells, facei)
@@ -185,9 +185,9 @@ void Foam::domainDecomposition::decomposeMesh()
                 patches[patchi]
             );
             // cyclic: check opposite side on this processor
-            const unallocLabelList& patchFaceCells = pp.faceCells();
+            const labelUList& patchFaceCells = pp.faceCells();
 
-            const unallocLabelList& nbrPatchFaceCells =
+            const labelUList& nbrPatchFaceCells =
                 pp.neighbPatch().faceCells();
 
             forAll(patchFaceCells, facei)
@@ -259,8 +259,8 @@ void Foam::domainDecomposition::decomposeMesh()
             );
 
             // cyclic: check opposite side on this processor
-            const unallocLabelList& patchFaceCells = pp.faceCells();
-            const unallocLabelList& nbrPatchFaceCells =
+            const labelUList& patchFaceCells = pp.faceCells();
+            const labelUList& nbrPatchFaceCells =
                 pp.neighbPatch().faceCells();
 
             // Store old sizes. Used to detect which inter-proc patches
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
index 0fdb960abd..02d06bdc01 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
@@ -30,7 +30,7 @@ License
 
 Foam::fvFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
 (
-    const unallocLabelList& addressingSlice,
+    const labelUList& addressingSlice,
     const label addressingOffset
 )
 :
@@ -48,7 +48,7 @@ Foam::fvFieldDecomposer::processorVolPatchFieldDecomposer::
 processorVolPatchFieldDecomposer
 (
     const fvMesh& mesh,
-    const unallocLabelList& addressingSlice
+    const labelUList& addressingSlice
 )
 :
     directAddressing_(addressingSlice.size())
@@ -95,7 +95,7 @@ processorVolPatchFieldDecomposer
 Foam::fvFieldDecomposer::processorSurfacePatchFieldDecomposer::
 processorSurfacePatchFieldDecomposer
 (
-    const unallocLabelList& addressingSlice
+    const labelUList& addressingSlice
 )
 :
     addressing_(addressingSlice.size()),
@@ -171,7 +171,7 @@ Foam::fvFieldDecomposer::fvFieldDecomposer
             processorSurfacePatchFieldDecomposerPtrs_[patchi] =
                 new processorSurfacePatchFieldDecomposer
                 (
-                    static_cast<const unallocLabelList&>
+                    static_cast<const labelUList&>
                     (
                         procMesh_.boundary()[patchi].patchSlice
                         (
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
index 92d679c4e5..5e7daf91cf 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
@@ -71,7 +71,7 @@ public:
                 //- Construct given addressing
                 patchFieldDecomposer
                 (
-                    const unallocLabelList& addressingSlice,
+                    const labelUList& addressingSlice,
                     const label addressingOffset
                 );
 
@@ -88,7 +88,7 @@ public:
                     return true;
                 }
 
-                const unallocLabelList& directAddressing() const
+                const labelUList& directAddressing() const
                 {
                     return directAddressing_;
                 }
@@ -112,7 +112,7 @@ public:
             processorVolPatchFieldDecomposer
             (
                 const fvMesh& mesh,
-                const unallocLabelList& addressingSlice
+                const labelUList& addressingSlice
             );
 
 
@@ -128,7 +128,7 @@ public:
                     return true;
                 }
 
-                const unallocLabelList& directAddressing() const
+                const labelUList& directAddressing() const
                 {
                     return directAddressing_;
                 }
@@ -149,7 +149,7 @@ public:
             //- Construct given addressing
             processorSurfacePatchFieldDecomposer
             (
-                const unallocLabelList& addressingSlice
+                const labelUList& addressingSlice
             );
 
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
index e4be50670c..a271675c62 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
@@ -88,7 +88,7 @@ public:
                     return true;
                 }
 
-                const unallocLabelList& directAddressing() const
+                const labelUList& directAddressing() const
                 {
                     return directAddressing_;
                 }
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H b/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
index 19a87ec641..95c774957b 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
@@ -79,7 +79,7 @@ public:
         inline static List<Keyed<T> > createList
         (
             const List<T>&,
-            const List<label>& keys
+            const labelUList& keys
         );
 
 
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
index 40c9c5b435..940c66c867 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
@@ -90,13 +90,13 @@ Foam::Keyed<T>::createList(const List<T>& lst, const label key)
 
 template<class T>
 inline Foam::List<Foam::Keyed<T> >
-Foam::Keyed<T>::createList(const List<T>& lst, const List<label>& keys)
+Foam::Keyed<T>::createList(const List<T>& lst, const labelUList& keys)
 {
     if (lst.size() != keys.size())
     {
         FatalErrorIn
         (
-            "Foam::Keyed<T>::createList(const List<T>&, const List<label>&)"
+            "Foam::Keyed<T>::createList(const List<T>&, const labelUList&)"
         )
             << "size mismatch adding keys to a list:" << nl
             << "List has size " << lst.size()
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
index 468170e6ac..2f7def3755 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
@@ -65,7 +65,7 @@ public:
         (
             const UList<T>& posList,
             const UList<T>& negList,
-            const UList<label>&
+            const labelUList&
         );
 
         //- Construct given the complete list and by transferring addressing
@@ -100,7 +100,7 @@ public:
         // Edit
 
             //- Reset addressing
-            inline void resetAddressing(const UList<label>&);
+            inline void resetAddressing(const labelUList&);
             inline void resetAddressing(const Xfer<List<label> >&);
 
 
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
index 8eee46ed1a..5b407bfac7 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
@@ -30,7 +30,7 @@ inline Foam::BiIndirectList<T>::BiIndirectList
 (
     const UList<T>& posList,
     const UList<T>& negList,
-    const UList<label>& addr
+    const labelUList& addr
 )
 :
     posList_(const_cast<UList<T>&>(posList)),
@@ -94,7 +94,7 @@ inline const Foam::List<Foam::label>& Foam::BiIndirectList<T>::addressing()
 template<class T>
 inline void Foam::BiIndirectList<T>::resetAddressing
 (
-    const UList<label>& addr
+    const labelUList& addr
 )
 {
     addressing_ = addr;
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 99053dc121..56697a934c 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -59,7 +59,7 @@ Foam::CompactListList<T, Container>::CompactListList(const List<Container>& ll)
 template<class T, class Container>
 Foam::CompactListList<T, Container>::CompactListList
 (
-    const UList<label>& rowSizes
+    const labelUList& rowSizes
 )
 :
     size_(rowSizes.size()),
@@ -80,7 +80,7 @@ Foam::CompactListList<T, Container>::CompactListList
 template<class T, class Container>
 Foam::CompactListList<T, Container>::CompactListList
 (
-    const UList<label>& rowSizes,
+    const labelUList& rowSizes,
     const T& t
 )
 :
@@ -178,7 +178,7 @@ void Foam::CompactListList<T, Container>::setSize
 
 
 template<class T, class Container>
-void Foam::CompactListList<T, Container>::setSize(const UList<label>& rowSizes)
+void Foam::CompactListList<T, Container>::setSize(const labelUList& rowSizes)
 {
     size_ = rowSizes.size();
     offsets_.setSize(rowSizes.size()+1);
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 2f73bc4c67..521b6b341d 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -114,10 +114,10 @@ public:
         inline CompactListList(const label nRows, const label nData, const T&);
 
         //- Construct given list of row-sizes.
-        explicit CompactListList(const UList<label>& rowSizes);
+        explicit CompactListList(const labelUList& rowSizes);
 
         //- Construct given list of row-sizes
-        CompactListList(const UList<label>& rowSizes, const T&);
+        CompactListList(const labelUList& rowSizes, const T&);
 
         //- Construct by transferring the parameter contents
         explicit CompactListList(const Xfer<CompactListList<T, Container> >&);
@@ -168,7 +168,7 @@ public:
             void setSize(const label nRows, const label nData, const T&);
 
             //- Reset size of CompactListList.
-            void setSize(const UList<label>& rowSizes);
+            void setSize(const labelUList& rowSizes);
 
             //- Reset size of CompactListList.
             //  This form only allows contraction of the CompactListList.
@@ -181,7 +181,7 @@ public:
             inline void resize(const label nRows, const label nData, const T&);
 
             //- Reset size of CompactListList.
-            inline void resize(const UList<label>& rowSizes);
+            inline void resize(const labelUList& rowSizes);
 
             //- Clear the CompactListList, i.e. set sizes to zero.
             void clear();
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index d149ec5956..1441428511 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -207,7 +207,7 @@ inline void Foam::CompactListList<T, Container>::resize
 template<class T, class Container>
 inline void Foam::CompactListList<T, Container>::resize
 (
-    const UList<label>& rowSizes
+    const labelUList& rowSizes
 )
 {
     this->setSize(rowSizes);
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index ec65a14a1b..3e6026315f 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -73,7 +73,7 @@ protected:
     // Constructors
 
         //- Construct by copying the addressing array
-        explicit inline IndirectListAddressing(const UList<label>& addr);
+        explicit inline IndirectListAddressing(const labelUList& addr);
 
         //- Construct by transferring addressing array
         explicit inline IndirectListAddressing(const Xfer<List<label> >& addr);
@@ -89,7 +89,7 @@ protected:
         // Edit
 
             //- Reset addressing
-            inline void resetAddressing(const UList<label>&);
+            inline void resetAddressing(const labelUList&);
             inline void resetAddressing(const Xfer<List<label> >&);
 
 };
@@ -119,7 +119,7 @@ public:
     // Constructors
 
         //- Construct given the complete list and the addressing array
-        inline IndirectList(const UList<T>&, const UList<label>&);
+        inline IndirectList(const UList<T>&, const labelUList&);
 
         //- Construct given the complete list and by transferring addressing
         inline IndirectList(const UList<T>&, const Xfer<List<label> >&);
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
index 0303ba2d5e..78e0a4a3b6 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
@@ -28,7 +28,7 @@ License
 
 inline Foam::IndirectListAddressing::IndirectListAddressing
 (
-    const UList<label>& addr
+    const labelUList& addr
 )
 :
     addressing_(addr)
@@ -48,7 +48,7 @@ template<class T>
 inline Foam::IndirectList<T>::IndirectList
 (
     const UList<T>& completeList,
-    const UList<label>& addr
+    const labelUList& addr
 )
 :
     IndirectListAddressing(addr),
@@ -117,7 +117,7 @@ Foam::IndirectListAddressing::addressing() const
 
 inline void Foam::IndirectListAddressing::resetAddressing
 (
-    const UList<label>& addr
+    const labelUList& addr
 )
 {
     addressing_ = addr;
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index ae4a36a805..f1c5be5ed1 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -155,7 +155,7 @@ Foam::List<T>::List(List<T>& a, bool reUse)
 
 // Construct as subset
 template<class T>
-Foam::List<T>::List(const UList<T>& a, const unallocLabelList& map)
+Foam::List<T>::List(const UList<T>& a, const labelUList& map)
 :
     UList<T>(NULL, map.size())
 {
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index d51a1f9eef..c3d631ad67 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -115,7 +115,7 @@ public:
         List(List<T>&, bool reUse);
 
         //- Construct as subset.
-        List(const UList<T>&, const unallocLabelList& mapAddressing);
+        List(const UList<T>&, const labelUList& mapAddressing);
 
         //- Construct given start and end iterators.
         template<class InputIterator>
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
index 96b1b30182..35c4b31d40 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
@@ -36,7 +36,7 @@ const Foam::labelList Foam::emptyLabelList = Foam::labelList(0);
 Foam::labelList Foam::invert
 (
     const label len,
-    const UList<label>& map
+    const labelUList& map
 )
 {
     labelList inverse(len, -1);
@@ -49,7 +49,7 @@ Foam::labelList Foam::invert
         {
             if (inverse[newPos] >= 0)
             {
-                FatalErrorIn("invert(const label, const UList<label>&)")
+                FatalErrorIn("invert(const label, const labelUList&)")
                     << "Map is not one-to-one. At index " << i
                     << " element " << newPos << " has already occurred before"
                     << nl << "Please use invertOneToMany instead"
@@ -66,7 +66,7 @@ Foam::labelList Foam::invert
 Foam::labelListList Foam::invertOneToMany
 (
     const label len,
-    const UList<label>& map
+    const labelUList& map
 )
 {
     labelList nElems(len, 0);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index ce16f5431a..973d40480b 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -56,23 +56,23 @@ static const List<Type>& emptyList()
 //- Renumber the values (not the indices) of a list.
 //  Negative ListType elements are left as is.
 template<class ListType>
-ListType renumber(const UList<label>& oldToNew, const ListType&);
+ListType renumber(const labelUList& oldToNew, const ListType&);
 
 //- Inplace renumber the values of a list.
 //  Negative ListType elements are left as is.
 template<class ListType>
-void inplaceRenumber(const UList<label>& oldToNew, ListType&);
+void inplaceRenumber(const labelUList& oldToNew, ListType&);
 
 
 //- Reorder the elements (indices, not values) of a list.
 //  Negative ListType elements are left as is.
 template<class ListType>
-ListType reorder(const UList<label>& oldToNew, const ListType&);
+ListType reorder(const labelUList& oldToNew, const ListType&);
 
 //- Inplace reorder the elements of a list.
 //  Negative ListType elements are left as is.
 template<class ListType>
-void inplaceReorder(const UList<label>& oldToNew, ListType&);
+void inplaceReorder(const labelUList& oldToNew, ListType&);
 
 
 // Variants to work with iterators and sparse tables.
@@ -80,11 +80,11 @@ void inplaceReorder(const UList<label>& oldToNew, ListType&);
 
 //- Map values. Do not map negative values.
 template<class Container>
-void inplaceMapValue(const UList<label>& oldToNew, Container&);
+void inplaceMapValue(const labelUList& oldToNew, Container&);
 
 //- Recreate with mapped keys. Do not map elements with negative key.
 template<class Container>
-void inplaceMapKey(const UList<label>& oldToNew, Container&);
+void inplaceMapKey(const labelUList& oldToNew, Container&);
 
 
 //- Generate the (stable) sort order for the list
@@ -126,10 +126,10 @@ template<class BoolListType, class ListType>
 void inplaceSubset(const BoolListType& select, ListType&);
 
 //- Invert one-to-one map. Unmapped elements will be -1.
-labelList invert(const label len, const UList<label>&);
+labelList invert(const label len, const labelUList&);
 
 //- Invert one-to-many map. Unmapped elements will be size 0.
-labelListList invertOneToMany(const label len, const UList<label>&);
+labelListList invertOneToMany(const label len, const labelUList&);
 
 //- Invert many-to-many.
 //  Input and output types need to be inherited from List.
@@ -172,7 +172,7 @@ template<class ListType>
 void setValues
 (
     ListType&,
-    const UList<label>& indices,
+    const labelUList& indices,
     typename ListType::const_reference
 );
 
@@ -182,7 +182,7 @@ ListType createWithValues
 (
     const label sz,
     typename ListType::const_reference initValue,
-    const UList<label>& indices,
+    const labelUList& indices,
     typename ListType::const_reference setValue
 );
 
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 65bd73563d..cfe1d64825 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -30,7 +30,7 @@ License
 template<class ListType>
 ListType Foam::renumber
 (
-    const UList<label>& oldToNew,
+    const labelUList& oldToNew,
     const ListType& lst
 )
 {
@@ -55,7 +55,7 @@ ListType Foam::renumber
 template<class ListType>
 void Foam::inplaceRenumber
 (
-    const UList<label>& oldToNew,
+    const labelUList& oldToNew,
     ListType& lst
 )
 {
@@ -72,7 +72,7 @@ void Foam::inplaceRenumber
 template<class ListType>
 ListType Foam::reorder
 (
-    const UList<label>& oldToNew,
+    const labelUList& oldToNew,
     const ListType& lst
 )
 {
@@ -100,7 +100,7 @@ ListType Foam::reorder
 template<class ListType>
 void Foam::inplaceReorder
 (
-    const UList<label>& oldToNew,
+    const labelUList& oldToNew,
     ListType& lst
 )
 {
@@ -129,7 +129,7 @@ void Foam::inplaceReorder
 template<class Container>
 void Foam::inplaceMapValue
 (
-    const UList<label>& oldToNew,
+    const labelUList& oldToNew,
     Container& lst
 )
 {
@@ -151,7 +151,7 @@ void Foam::inplaceMapValue
 template<class Container>
 void Foam::inplaceMapKey
 (
-    const UList<label>& oldToNew,
+    const labelUList& oldToNew,
     Container& lst
 )
 {
@@ -483,7 +483,7 @@ template<class ListType>
 void Foam::setValues
 (
     ListType& l,
-    const UList<label>& indices,
+    const labelUList& indices,
     typename ListType::const_reference t
 )
 {
@@ -499,7 +499,7 @@ ListType Foam::createWithValues
 (
     const label sz,
     const typename ListType::const_reference initValue,
-    const UList<label>& indices,
+    const labelUList& indices,
     typename ListType::const_reference setValue
 )
 {
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
index 79a383a685..94d6308658 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
@@ -188,7 +188,7 @@ void Foam::PackedBoolList::set(const PackedList<1>& lst)
 }
 
 
-Foam::label Foam::PackedBoolList::set(const UList<label>& indices)
+Foam::label Foam::PackedBoolList::set(const labelUList& indices)
 {
     return setIndices(indices);
 }
@@ -216,7 +216,7 @@ void Foam::PackedBoolList::unset(const PackedList<1>& lst)
 }
 
 
-Foam::label Foam::PackedBoolList::unset(const UList<label>& indices)
+Foam::label Foam::PackedBoolList::unset(const labelUList& indices)
 {
     return unsetIndices(indices);
 }
@@ -249,7 +249,7 @@ void Foam::PackedBoolList::subset(const PackedList<1>& lst)
 }
 
 
-Foam::label Foam::PackedBoolList::subset(const UList<label>& indices)
+Foam::label Foam::PackedBoolList::subset(const labelUList& indices)
 {
     return subsetIndices(indices);
 }
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
index fb790a3e05..1949c49ba1 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
@@ -119,7 +119,7 @@ public:
 
         //- Construct from a list of labels
         //  using the labels as indices to indicate which bits are set
-        explicit inline PackedBoolList(const UList<label>& indices);
+        explicit inline PackedBoolList(const labelUList& indices);
 
         //- Construct from a list of labels
         //  using the labels as indices to indicate which bits are set
@@ -141,7 +141,7 @@ public:
 
             //- Set the listed indices. Return number of elements changed.
             //  Does auto-vivify for non-existent entries.
-            label set(const UList<label>& indices);
+            label set(const labelUList& indices);
 
             //- Set the listed indices. Return number of elements changed.
             //  Does auto-vivify for non-existent entries.
@@ -152,7 +152,7 @@ public:
 
             //- Unset the listed indices. Return number of elements changed.
             //  Never auto-vivify entries.
-            label unset(const UList<label>& indices);
+            label unset(const labelUList& indices);
 
             //- Unset the listed indices. Return number of elements changed.
             //  Never auto-vivify entries.
@@ -163,7 +163,7 @@ public:
 
             //- Subset with the listed indices.
             //  Return number of elements subsetted.
-            label subset(const UList<label>& indices);
+            label subset(const labelUList& indices);
 
             //- Subset with the listed indices.
             //  Return number of elements subsetted.
@@ -204,7 +204,7 @@ public:
 
             //- Assignment operator,
             //  using the labels as indices to indicate which bits are set
-            inline PackedBoolList& operator=(const UList<label>& indices);
+            inline PackedBoolList& operator=(const labelUList& indices);
 
             //- Assignment operator,
             //  using the labels as indices to indicate which bits are set
@@ -218,7 +218,7 @@ public:
 
             //- And operator (lists may be dissimilar sizes)
             //  using the labels as indices to indicate which bits are set
-            inline PackedBoolList& operator&=(const UList<label>& indices);
+            inline PackedBoolList& operator&=(const labelUList& indices);
 
             //- And operator (lists may be dissimilar sizes)
             //  using the labels as indices to indicate which bits are set
@@ -233,7 +233,7 @@ public:
 
             //- Or operator (lists may be dissimilar sizes),
             //  using the labels as indices to indicate which bits are set
-            inline PackedBoolList& operator|=(const UList<label>& indices);
+            inline PackedBoolList& operator|=(const labelUList& indices);
 
             //- Or operator (lists may be dissimilar sizes),
             //  using the labels as indices to indicate which bits are set
@@ -244,7 +244,7 @@ public:
             inline PackedBoolList& operator+=(const PackedList<1>&);
 
             //- Add entries to this list, synonymous with the or operator
-            inline PackedBoolList& operator+=(const UList<label>& indices);
+            inline PackedBoolList& operator+=(const labelUList& indices);
 
             //- Add entries to this list, synonymous with the or operator
             inline PackedBoolList& operator+=(const UIndirectList<label>&);
@@ -253,7 +253,7 @@ public:
             inline PackedBoolList& operator-=(const PackedList<1>&);
 
             //- Remove entries from this list - unset the specified bits
-            inline PackedBoolList& operator-=(const UList<label>& indices);
+            inline PackedBoolList& operator-=(const labelUList& indices);
 
             //- Remove entries from this list - unset the specified bits
             inline PackedBoolList& operator-=(const UIndirectList<label>&);
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
index 793959e59b..219fb79b37 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
@@ -81,7 +81,7 @@ inline Foam::PackedBoolList::PackedBoolList(const UList<bool>& lst)
 }
 
 
-inline Foam::PackedBoolList::PackedBoolList(const UList<label>& indices)
+inline Foam::PackedBoolList::PackedBoolList(const labelUList& indices)
 :
     PackedList<1>(indices.size(), 0u)
 {
@@ -151,7 +151,7 @@ Foam::PackedBoolList::operator=(const PackedList<1>& lst)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator=(const UList<label>& indices)
+Foam::PackedBoolList::operator=(const labelUList& indices)
 {
     clear();
     set(indices);
@@ -189,7 +189,7 @@ Foam::PackedBoolList::operator&=(const PackedList<1>& lst)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator&=(const UList<label>& indices)
+Foam::PackedBoolList::operator&=(const labelUList& indices)
 {
     subset(indices);
     return *this;
@@ -213,7 +213,7 @@ Foam::PackedBoolList::operator|=(const PackedList<1>& lst)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator|=(const UList<label>& indices)
+Foam::PackedBoolList::operator|=(const labelUList& indices)
 {
     set(indices);
     return *this;
@@ -236,7 +236,7 @@ Foam::PackedBoolList::operator+=(const PackedList<1>& lst)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator+=(const UList<label>& indices)
+Foam::PackedBoolList::operator+=(const labelUList& indices)
 {
     return operator|=(indices);
 }
@@ -258,7 +258,7 @@ Foam::PackedBoolList::operator-=(const PackedList<1>& lst)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator-=(const UList<label>& indices)
+Foam::PackedBoolList::operator-=(const labelUList& indices)
 {
     unset(indices);
     return *this;
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 98a6d2740a..265088056b 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -536,7 +536,7 @@ Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
 
 template<unsigned nBits>
 Foam::PackedList<nBits>&
-Foam::PackedList<nBits>::operator=(const UList<label>& lst)
+Foam::PackedList<nBits>::operator=(const labelUList& lst)
 {
     setCapacity(lst.size());
     size_ = lst.size();
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 9d970ec055..9b68420c11 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -229,7 +229,7 @@ public:
         inline PackedList(const Xfer<PackedList<nBits> >&);
 
         //- Construct from a list of labels
-        explicit inline PackedList(const UList<label>&);
+        explicit inline PackedList(const labelUList&);
 
         //- Construct from an indirect list of labels
         explicit inline PackedList(const UIndirectList<label>&);
@@ -404,7 +404,7 @@ public:
             PackedList<nBits>& operator=(const PackedList<nBits>&);
 
             //- Assignment operator.
-            PackedList<nBits>& operator=(const UList<label>&);
+            PackedList<nBits>& operator=(const labelUList&);
 
             //- Assignment operator.
             PackedList<nBits>& operator=(const UIndirectList<label>&);
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 4b2a00d251..f1a69236c1 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -237,7 +237,7 @@ inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
 
 
 template<unsigned nBits>
-inline Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
+inline Foam::PackedList<nBits>::PackedList(const labelUList& lst)
 :
     PackedListCore(),
     StorageList(packedLength(lst.size()), 0u),
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index e4e4b10481..613fa30a47 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -204,11 +204,11 @@ void Foam::PtrList<T>::transfer(PtrList<T>& a)
 
 
 template<class T>
-void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
+void Foam::PtrList<T>::reorder(const labelUList& oldToNew)
 {
     if (oldToNew.size() != size())
     {
-        FatalErrorIn("PtrList<T>::reorder(const UList<label>&)")
+        FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
             << "Size of map (" << oldToNew.size()
             << ") not equal to list size (" << size()
             << ")." << abort(FatalError);
@@ -222,7 +222,7 @@ void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
 
         if (newI < 0 || newI >= size())
         {
-            FatalErrorIn("PtrList<T>::reorder(const UList<label>&)")
+            FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
                 << "Illegal index " << newI << nl
                 << "Valid indices are 0.." << size()-1
                 << abort(FatalError);
@@ -230,7 +230,7 @@ void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
 
         if (newPtrs_[newI])
         {
-            FatalErrorIn("PtrList<T>::reorder(const UList<label>&)")
+            FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
                 << "reorder map is not unique; element " << newI
                 << " already set." << abort(FatalError);
         }
@@ -241,7 +241,7 @@ void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
     {
         if (!newPtrs_[i])
         {
-            FatalErrorIn("PtrList<T>::reorder(const UList<label>&)")
+            FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
                 << "Element " << i << " not set after reordering." << nl
                 << abort(FatalError);
         }
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index 42bcd8bc35..e4ea26ea5d 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -208,7 +208,7 @@ public:
             //- Reorders elements. Ordering does not have to be done in
             //  ascending or descending order. Reordering has to be unique.
             //  (is shuffle)
-            void reorder(const UList<label>&);
+            void reorder(const labelUList&);
 
 
     // Member operators
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index 2519c70086..7fbff38236 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -58,7 +58,7 @@ class UIndirectList
     // Private data
 
         UList<T>& completeList_;
-        const UList<label>& addressing_;
+        const labelUList& addressing_;
 
 
 public:
@@ -66,7 +66,7 @@ public:
     // Constructors
 
         //- Construct given the complete list and the addressing array
-        inline UIndirectList(const UList<T>&, const UList<label>&);
+        inline UIndirectList(const UList<T>&, const labelUList&);
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
index 709aba9995..e7e10e67e7 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
@@ -29,7 +29,7 @@ template<class T>
 inline Foam::UIndirectList<T>::UIndirectList
 (
     const UList<T>& completeList,
-    const UList<label>& addr
+    const labelUList& addr
 )
 :
     completeList_(const_cast<UList<T>&>(completeList)),
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index 85d493724a..a5f9ea6fd5 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
@@ -100,11 +100,11 @@ void Foam::UPtrList<T>::transfer(UPtrList<T>& a)
 
 
 template<class T>
-void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
+void Foam::UPtrList<T>::reorder(const labelUList& oldToNew)
 {
     if (oldToNew.size() != size())
     {
-        FatalErrorIn("UPtrList<T>::reorder(const UList<label>&)")
+        FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
             << "Size of map (" << oldToNew.size()
             << ") not equal to list size (" << size()
             << ")." << abort(FatalError);
@@ -118,7 +118,7 @@ void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
 
         if (newI < 0 || newI >= size())
         {
-            FatalErrorIn("UPtrList<T>::reorder(const UList<label>&)")
+            FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
                 << "Illegal index " << newI << nl
                 << "Valid indices are 0.." << size()-1
                 << abort(FatalError);
@@ -126,7 +126,7 @@ void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
 
         if (newPtrs_[newI])
         {
-            FatalErrorIn("UPtrList<T>::reorder(const UList<label>&)")
+            FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
                 << "reorder map is not unique; element " << newI
                 << " already set." << abort(FatalError);
         }
@@ -137,7 +137,7 @@ void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
     {
         if (!newPtrs_[i])
         {
-            FatalErrorIn("UPtrList<T>::reorder(const UList<label>&)")
+            FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
                 << "Element " << i << " not set after reordering." << nl
                 << abort(FatalError);
         }
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index 2508a9f679..4927110d0a 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -171,7 +171,7 @@ public:
             //- Reorders elements. Ordering does not have to be done in
             //  ascending or descending order. Reordering has to be unique.
             //  (is shuffle)
-            void reorder(const UList<label>&);
+            void reorder(const labelUList&);
 
 
     // Member operators
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index e5c5a7cced..979442ac86 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -66,7 +66,7 @@ template<class Type>
 Field<Type>::Field
 (
     const UList<Type>& mapF,
-    const UList<label>& mapAddressing
+    const labelUList& mapAddressing
 )
 :
     List<Type>(mapAddressing.size())
@@ -78,7 +78,7 @@ template<class Type>
 Field<Type>::Field
 (
     const tmp<Field<Type> >& tmapF,
-    const UList<label>& mapAddressing
+    const labelUList& mapAddressing
 )
 :
     List<Type>(mapAddressing.size())
@@ -297,7 +297,7 @@ template<class Type>
 void Field<Type>::map
 (
     const UList<Type>& mapF,
-    const UList<label>& mapAddressing
+    const labelUList& mapAddressing
 )
 {
     Field<Type>& f = *this;
@@ -326,7 +326,7 @@ template<class Type>
 void Field<Type>::map
 (
     const tmp<Field<Type> >& tmapF,
-    const UList<label>& mapAddressing
+    const labelUList& mapAddressing
 )
 {
     map(tmapF(), mapAddressing);
@@ -455,7 +455,7 @@ template<class Type>
 void Field<Type>::rmap
 (
     const UList<Type>& mapF,
-    const UList<label>& mapAddressing
+    const labelUList& mapAddressing
 )
 {
     Field<Type>& f = *this;
@@ -475,7 +475,7 @@ template<class Type>
 void Field<Type>::rmap
 (
     const tmp<Field<Type> >& tmapF,
-    const UList<label>& mapAddressing
+    const labelUList& mapAddressing
 )
 {
     rmap(tmapF(), mapAddressing);
@@ -487,7 +487,7 @@ template<class Type>
 void Field<Type>::rmap
 (
     const UList<Type>& mapF,
-    const UList<label>& mapAddressing,
+    const labelUList& mapAddressing,
     const UList<scalar>& mapWeights
 )
 {
@@ -505,7 +505,7 @@ template<class Type>
 void Field<Type>::rmap
 (
     const tmp<Field<Type> >& tmapF,
-    const UList<label>& mapAddressing,
+    const labelUList& mapAddressing,
     const UList<scalar>& mapWeights
 )
 {
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 0682366211..a886dd3755 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -127,14 +127,14 @@ public:
         Field
         (
             const UList<Type>& mapF,
-            const UList<label>& mapAddressing
+            const labelUList& mapAddressing
         );
 
         //- Construct by 1 to 1 mapping from the given tmp field
         Field
         (
             const tmp<Field<Type> >& tmapF,
-            const UList<label>& mapAddressing
+            const labelUList& mapAddressing
         );
 
         //- Construct by interpolative mapping from the given field
@@ -208,14 +208,14 @@ public:
         void map
         (
             const UList<Type>& mapF,
-            const UList<label>& mapAddressing
+            const labelUList& mapAddressing
         );
 
         //- 1 to 1 map from the given tmp field
         void map
         (
             const tmp<Field<Type> >& tmapF,
-            const UList<label>& mapAddressing
+            const labelUList& mapAddressing
         );
 
         //- Interpolative map from the given field
@@ -258,21 +258,21 @@ public:
         void rmap
         (
             const UList<Type>& mapF,
-            const UList<label>& mapAddressing
+            const labelUList& mapAddressing
         );
 
         //- 1 to 1 reverse-map from the given tmp field
         void rmap
         (
             const tmp<Field<Type> >& tmapF,
-            const UList<label>& mapAddressing
+            const labelUList& mapAddressing
         );
 
         //- Interpolative reverse map from the given field
         void rmap
         (
             const UList<Type>& mapF,
-            const UList<label>& mapAddressing,
+            const labelUList& mapAddressing,
             const UList<scalar>& weights
         );
 
@@ -280,7 +280,7 @@ public:
         void rmap
         (
             const tmp<Field<Type> >& tmapF,
-            const UList<label>& mapAddressing,
+            const labelUList& mapAddressing,
             const UList<scalar>& weights
         );
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
index cb311a9cbd..50076825ef 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
@@ -64,13 +64,13 @@ public:
 
         virtual bool direct() const = 0;
 
-        virtual const unallocLabelList& directAddressing() const
+        virtual const labelUList& directAddressing() const
         {
             FatalErrorIn("FieldMapper::directAddressing() const")
                 << "attempt to access null direct addressing"
                 << abort(FatalError);
 
-            return unallocLabelList::null();
+            return labelUList::null();
         }
 
         virtual const labelListList& addressing() const
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelField.C b/src/OpenFOAM/fields/Fields/labelField/labelField.C
index 73e59a8d42..46ab6a2bce 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelField.C
+++ b/src/OpenFOAM/fields/Fields/labelField/labelField.C
@@ -52,7 +52,7 @@ template<>
 void component
 (
     labelField& lf,
-    const UList<label>& f,
+    const labelUList& f,
     const direction
 )
 {
@@ -60,7 +60,7 @@ void component
 }
 
 template<>
-void labelField::replace(const direction, const UList<label>& lf)
+void labelField::replace(const direction, const labelUList& lf)
 {
     *this = lf;
 }
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelField.H b/src/OpenFOAM/fields/Fields/labelField/labelField.H
index 235002c24b..fe5132e3bb 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelField.H
+++ b/src/OpenFOAM/fields/Fields/labelField/labelField.H
@@ -61,12 +61,12 @@ template<>
 void component
 (
     labelField& lf,
-    const UList<label>& f,
+    const labelUList& f,
     const direction
 );
 
 template<>
-void labelField::replace(const direction, const UList<label>& lf);
+void labelField::replace(const direction, const labelUList& lf);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/transformList/transformList.H b/src/OpenFOAM/fields/Fields/transformList/transformList.H
index b74d165b04..6cc9944de8 100644
--- a/src/OpenFOAM/fields/Fields/transformList/transformList.H
+++ b/src/OpenFOAM/fields/Fields/transformList/transformList.H
@@ -70,7 +70,7 @@ void transformList(const tensorField&, EdgeMap<T>&);
 
 
 template<>
-inline void transformList(const tensorField&, UList<label>&)
+inline void transformList(const tensorField&, labelUList&)
 {}
 template<>
 inline void transformList(const tensorField&, Map<label>&)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index ea8e0d40fe..bd8b56b49c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -42,7 +42,7 @@ void Foam::lduAddressing::calcLosort() const
     // and resizing list
     labelList nNbrOfFace(size(), 0);
 
-    const unallocLabelList& nbr = upperAddr();
+    const labelUList& nbr = upperAddr();
 
     forAll(nbr, nbrI)
     {
@@ -181,7 +181,7 @@ Foam::lduAddressing::~lduAddressing()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::unallocLabelList& Foam::lduAddressing::losortAddr() const
+const Foam::labelUList& Foam::lduAddressing::losortAddr() const
 {
     if (!losortPtr_)
     {
@@ -192,7 +192,7 @@ const Foam::unallocLabelList& Foam::lduAddressing::losortAddr() const
 }
 
 
-const Foam::unallocLabelList& Foam::lduAddressing::ownerStartAddr() const
+const Foam::labelUList& Foam::lduAddressing::ownerStartAddr() const
 {
     if (!ownerStartPtr_)
     {
@@ -203,7 +203,7 @@ const Foam::unallocLabelList& Foam::lduAddressing::ownerStartAddr() const
 }
 
 
-const Foam::unallocLabelList& Foam::lduAddressing::losortStartAddr() const
+const Foam::labelUList& Foam::lduAddressing::losortStartAddr() const
 {
     if (!losortStartPtr_)
     {
@@ -225,7 +225,7 @@ Foam::label Foam::lduAddressing::triIndex(const label a, const label b) const
 
     label endLabel = ownerStartAddr()[own + 1];
 
-    const unallocLabelList& neighbour = upperAddr();
+    const labelUList& neighbour = upperAddr();
 
     for (label i = startLabel; i < endLabel; i++)
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
index 6a55754bd1..d88c772c3d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
@@ -171,13 +171,13 @@ public:
         }
 
         //- Return lower addressing
-        virtual const unallocLabelList& lowerAddr() const = 0;
+        virtual const labelUList& lowerAddr() const = 0;
 
         //- Return upper addressing
-        virtual const unallocLabelList& upperAddr() const = 0;
+        virtual const labelUList& upperAddr() const = 0;
 
         //- Return patch to internal addressing given patch number
-        virtual const unallocLabelList& patchAddr
+        virtual const labelUList& patchAddr
         (
             const label patchNo
         ) const = 0;
@@ -186,13 +186,13 @@ public:
         virtual const lduSchedule& patchSchedule() const = 0;
 
         //- Return losort addressing
-        const unallocLabelList& losortAddr() const;
+        const labelUList& losortAddr() const;
 
         //- Return owner start addressing
-        const unallocLabelList& ownerStartAddr() const;
+        const labelUList& ownerStartAddr() const;
 
         //- Return losort start addressing
-        const unallocLabelList& losortStartAddr() const;
+        const labelUList& losortStartAddr() const;
 
         //- Return off-diagonal index given owner and neighbour label
         label triIndex(const label a, const label b) const;
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index 5cb7b22de5..5e76b0ebf6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -84,7 +84,7 @@ public:
         // Access
 
             //- Return faceCell addressing
-            virtual const unallocLabelList& faceCells() const = 0;
+            virtual const labelUList& faceCells() const = 0;
 
 
         // Interface transfer functions
@@ -93,14 +93,14 @@ public:
             //  the interface as a field
             virtual tmp<labelField> interfaceInternalField
             (
-                const unallocLabelList& internalData
+                const labelUList& internalData
             ) const = 0;
 
             //- Initialise transfer of internal field adjacent to the interface
             virtual void initInternalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& iF
+                const labelUList& iF
             ) const
             {}
 
@@ -108,7 +108,7 @@ public:
             virtual tmp<labelField> internalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& iF
+                const labelUList& iF
             ) const = 0;
 };
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
index 78769a0606..714f7c3dee 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
@@ -188,7 +188,7 @@ void Foam::lduMatrix::sumA
     {
         if (interfaces.set(patchI))
         {
-            const unallocLabelList& pa = lduAddr().patchAddr(patchI);
+            const labelUList& pa = lduAddr().patchAddr(patchI);
             const scalarField& pCoeffs = interfaceBouCoeffs[patchI];
 
             forAll(pa, face)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
index b13ffeb5f8..c55002a38b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
@@ -36,8 +36,8 @@ void Foam::lduMatrix::sumDiag()
     const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
     scalarField& Diag = diag();
 
-    const unallocLabelList& l = lduAddr().lowerAddr();
-    const unallocLabelList& u = lduAddr().upperAddr();
+    const labelUList& l = lduAddr().lowerAddr();
+    const labelUList& u = lduAddr().upperAddr();
 
     for (register label face=0; face<l.size(); face++)
     {
@@ -53,8 +53,8 @@ void Foam::lduMatrix::negSumDiag()
     const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
     scalarField& Diag = diag();
 
-    const unallocLabelList& l = lduAddr().lowerAddr();
-    const unallocLabelList& u = lduAddr().upperAddr();
+    const labelUList& l = lduAddr().lowerAddr();
+    const labelUList& u = lduAddr().upperAddr();
 
     for (register label face=0; face<l.size(); face++)
     {
@@ -72,8 +72,8 @@ void Foam::lduMatrix::sumMagOffDiag
     const scalarField& Lower = const_cast<const lduMatrix&>(*this).lower();
     const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
 
-    const unallocLabelList& l = lduAddr().lowerAddr();
-    const unallocLabelList& u = lduAddr().upperAddr();
+    const labelUList& l = lduAddr().lowerAddr();
+    const labelUList& u = lduAddr().upperAddr();
 
     for (register label face = 0; face < l.size(); face++)
     {
@@ -288,7 +288,7 @@ void Foam::lduMatrix::operator*=(const scalarField& sf)
     {
         scalarField& upper = *upperPtr_;
 
-        const unallocLabelList& l = lduAddr().lowerAddr();
+        const labelUList& l = lduAddr().lowerAddr();
 
         for (register label face=0; face<upper.size(); face++)
         {
@@ -300,7 +300,7 @@ void Foam::lduMatrix::operator*=(const scalarField& sf)
     {
         scalarField& lower = *lowerPtr_;
 
-        const unallocLabelList& u = lduAddr().upperAddr();
+        const labelUList& u = lduAddr().upperAddr();
 
         for (register label face=0; face<lower.size(); face++)
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index f23831271f..dc83c1923e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
@@ -83,8 +83,8 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
         const scalarField& Lower = const_cast<const lduMatrix&>(*this).lower();
         const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
 
-        const unallocLabelList& l = lduAddr().lowerAddr();
-        const unallocLabelList& u = lduAddr().upperAddr();
+        const labelUList& l = lduAddr().lowerAddr();
+        const labelUList& u = lduAddr().upperAddr();
 
         tmp<Field<Type> > tfaceHpsi(new Field<Type> (Lower.size()));
         Field<Type> & faceHpsi = tfaceHpsi();
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index b2f23d05fe..82e0c570bf 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -36,8 +36,8 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
     const lduMesh& fineMesh = meshLevel(fineLevelIndex);
     const lduAddressing& fineMeshAddr = fineMesh.lduAddr();
 
-    const unallocLabelList& upperAddr = fineMeshAddr.upperAddr();
-    const unallocLabelList& lowerAddr = fineMeshAddr.lowerAddr();
+    const labelUList& upperAddr = fineMeshAddr.upperAddr();
+    const labelUList& lowerAddr = fineMeshAddr.lowerAddr();
 
     label nFineFaces = upperAddr.size();
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
index 520763fccf..3551b3327a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
@@ -37,8 +37,8 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
 {
     const label nFineCells = fineMatrixAddressing.size();
 
-    const unallocLabelList& upperAddr = fineMatrixAddressing.upperAddr();
-    const unallocLabelList& lowerAddr = fineMatrixAddressing.lowerAddr();
+    const labelUList& upperAddr = fineMatrixAddressing.upperAddr();
+    const labelUList& lowerAddr = fineMatrixAddressing.lowerAddr();
 
     // For each cell calculate faces
     labelList cellFaces(upperAddr.size() + lowerAddr.size());
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index 50b8cf1a25..364a118db4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -141,9 +141,9 @@ void Foam::GAMGSolver::agglomerateMatrix(const label fineLevelIndex)
         const labelList& restrictAddr =
             agglomeration_.restrictAddressing(fineLevelIndex);
 
-        const unallocLabelList& l = fineMatrix.lduAddr().lowerAddr();
-        const unallocLabelList& cl = coarseMatrix.lduAddr().lowerAddr();
-        const unallocLabelList& cu = coarseMatrix.lduAddr().upperAddr();
+        const labelUList& l = fineMatrix.lduAddr().lowerAddr();
+        const labelUList& cl = coarseMatrix.lduAddr().lowerAddr();
+        const labelUList& cu = coarseMatrix.lduAddr().upperAddr();
 
         forAll(faceRestrictAddr, fineFacei)
         {
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 d54510dc66..ba5ebe3bc6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
@@ -88,7 +88,7 @@ void Foam::cyclicGAMGInterfaceField::updateInterfaceMatrix
 
     transformCoupleField(pnf, cmpt);
 
-    const unallocLabelList& faceCells = cyclicInterface_.faceCells();
+    const labelUList& faceCells = cyclicInterface_.faceCells();
 
     forAll(faceCells, elemI)
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
index 22e1f95fde..37028f2fe6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
@@ -95,7 +95,7 @@ Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
 //    );
 //    transformCoupleField(pnf, cmpt);
 //
-//    const unallocLabelList& faceCells = procInterface_.faceCells();
+//    const labelUList& faceCells = procInterface_.faceCells();
 //
 //    forAll(faceCells, elemI)
 //    {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index 09fb8699a8..13e713ace4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -104,7 +104,7 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
     );
     transformCoupleField(pnf, cmpt);
 
-    const unallocLabelList& faceCells = procInterface_.faceCells();
+    const labelUList& faceCells = procInterface_.faceCells();
 
     forAll(faceCells, elemI)
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
index 1c4a032cd2..66cc20f50d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
@@ -51,7 +51,7 @@ void Foam::GAMGInterface::combine(const GAMGInterface& coarseGi)
 
 Foam::tmp<Foam::labelField> Foam::GAMGInterface::interfaceInternalField
 (
-    const unallocLabelList& internalData
+    const labelUList& internalData
 ) const
 {
     return interfaceInternalField<label>(internalData);
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index dfaddd03fd..78e22aa3ad 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
@@ -164,7 +164,7 @@ public:
             }
 
             //- Return faceCell addressing
-            virtual const unallocLabelList& faceCells() const
+            virtual const labelUList& faceCells() const
             {
                 return faceCells_;
             }
@@ -192,7 +192,7 @@ public:
             //  the interface as a field
             virtual tmp<labelField> interfaceInternalField
             (
-                const unallocLabelList& internalData
+                const labelUList& internalData
             ) const;
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index a0f328a1ae..58ffbd380d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -250,14 +250,14 @@ Foam::cyclicGAMGInterface::~cyclicGAMGInterface()
 Foam::tmp<Foam::labelField> Foam::cyclicGAMGInterface::internalFieldTransfer
 (
     const Pstream::commsTypes,
-    const unallocLabelList& iF
+    const labelUList& iF
 ) const
 {
     const cyclicGAMGInterface& nbr = dynamic_cast<const cyclicGAMGInterface&>
     (
         neighbPatch()
     );
-    const unallocLabelList& nbrFaceCells = nbr.faceCells();
+    const labelUList& nbrFaceCells = nbr.faceCells();
 
     tmp<labelField> tpnf(new labelField(size()));
     labelField& pnf = tpnf();
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
index 556d690136..3251353dfc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
@@ -100,7 +100,7 @@ public:
             virtual tmp<labelField> internalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& iF
+                const labelUList& iF
             ) const;
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index 6d5afa6218..7bdd548009 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -241,7 +241,7 @@ Foam::processorGAMGInterface::~processorGAMGInterface()
 void Foam::processorGAMGInterface::initInternalFieldTransfer
 (
     const Pstream::commsTypes commsType,
-    const unallocLabelList& iF
+    const labelUList& iF
 ) const
 {
     send(commsType, interfaceInternalField(iF)());
@@ -251,7 +251,7 @@ void Foam::processorGAMGInterface::initInternalFieldTransfer
 Foam::tmp<Foam::labelField> Foam::processorGAMGInterface::internalFieldTransfer
 (
     const Pstream::commsTypes commsType,
-    const unallocLabelList& iF
+    const labelUList& iF
 ) const
 {
     return receive<label>(commsType, this->size());
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index e6325bdc40..4d27ecaf8a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -100,14 +100,14 @@ public:
             virtual void initInternalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& iF
+                const labelUList& iF
             ) const;
 
             //- Transfer and return internal field adjacent to the interface
             virtual tmp<labelField> internalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& iF
+                const labelUList& iF
             ) const;
 
 
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
index 993953fa52..d1767dc5b2 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
@@ -86,8 +86,8 @@ public:
         lduPrimitiveMesh
         (
             const label nCells,
-            const unallocLabelList& l,
-            const unallocLabelList& u,
+            const labelUList& l,
+            const labelUList& u,
             const labelListList& pa,
             lduInterfacePtrsList interfaces,
             const lduSchedule& ps
@@ -146,19 +146,19 @@ public:
             }
 
             //- Return Lower addressing
-            virtual const unallocLabelList& lowerAddr() const
+            virtual const labelUList& lowerAddr() const
             {
                 return lowerAddr_;
             }
 
             //- Return Upper addressing
-            virtual const unallocLabelList& upperAddr() const
+            virtual const labelUList& upperAddr() const
             {
                 return upperAddr_;
             }
 
             //- Return patch addressing
-            virtual const unallocLabelList& patchAddr(const label i) const
+            virtual const labelUList& patchAddr(const label i) const
             {
                 return patchAddr_[i];
             }
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.H b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
index 8533b85508..099456d804 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
@@ -75,7 +75,7 @@ public:
         explicit inline cell(label);
 
         //- Construct from list of labels
-        explicit inline cell(const UList<label>&);
+        explicit inline cell(const labelUList&);
 
         //- Construct by transferring the parameter contents
         explicit inline cell(const Xfer<labelList>&);
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellI.H b/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
index bdfdf5bd3f..a5aeae3eea 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
@@ -40,7 +40,7 @@ inline Foam::cell::cell(label s)
 
 
 // Construct from components
-inline Foam::cell::cell(const UList<label>& lst)
+inline Foam::cell::cell(const labelUList& lst)
 :
     labelList(lst)
 {}
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index dd5fc4a832..2b96610fca 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -148,7 +148,7 @@ public:
         explicit inline face(label);
 
         //- Construct from list of labels
-        explicit inline face(const UList<label>&);
+        explicit inline face(const labelUList&);
 
         //- Construct from list of labels
         explicit inline face(const labelList&);
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
index 9b4c4f9b2c..165a11fd1a 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
@@ -51,7 +51,7 @@ inline Foam::face::face(label s)
 {}
 
 
-inline Foam::face::face(const UList<label>& lst)
+inline Foam::face::face(const labelUList& lst)
 :
     labelList(lst)
 {}
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index a0aee7375d..09a8faeeef 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -80,8 +80,8 @@ public:
             const label c
         );
 
-        //- Construct from a UList<label>
-        explicit inline triFace(const UList<label>&);
+        //- Construct from a list of labels
+        explicit inline triFace(const labelUList&);
 
         //- Construct from Istream
         inline triFace(Istream&);
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index 1396307ea1..1cac003d26 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -77,7 +77,7 @@ inline Foam::triFace::triFace
 }
 
 
-inline Foam::triFace::triFace(const UList<label>& lst)
+inline Foam::triFace::triFace(const labelUList& lst)
 :
     FixedList<label, 3>(lst)
 {}
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index 23b8993c24..6b33e43072 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -233,13 +233,13 @@ Foam::label Foam::pointMapper::sizeBeforeMapping() const
 }
 
 
-const Foam::unallocLabelList& Foam::pointMapper::directAddressing() const
+const Foam::labelUList& Foam::pointMapper::directAddressing() const
 {
     if (!direct())
     {
         FatalErrorIn
         (
-            "const unallocLabelList& pointMapper::directAddressing() const"
+            "const labelUList& pointMapper::directAddressing() const"
         )   << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
index 660b1b4215..7cab7be708 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
@@ -130,7 +130,7 @@ public:
         }
 
         //- Return direct addressing
-        virtual const unallocLabelList& directAddressing() const;
+        virtual const labelUList& directAddressing() const;
 
         //- Return interpolated addressing
         virtual const labelListList& addressing() const;
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
index ecccce8277..06454d16ed 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
@@ -140,13 +140,13 @@ Foam::pointPatchMapper::~pointPatchMapper()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::unallocLabelList& Foam::pointPatchMapper::directAddressing() const
+const Foam::labelUList& Foam::pointPatchMapper::directAddressing() const
 {
     if (!direct())
     {
         FatalErrorIn
         (
-            "const unallocLabelList& pointPatchMapper::directAddressing() const"
+            "const labelUList& pointPatchMapper::directAddressing() const"
         )   << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
index 813e977620..ff10294417 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
@@ -143,7 +143,7 @@ public:
         }
 
         //- Return direct addressing
-        virtual const unallocLabelList& directAddressing() const;
+        virtual const labelUList& directAddressing() const;
 
         //- Return interpolated addressing
         virtual const labelListList& addressing() const;
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index 1950a97b84..133946431a 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -326,13 +326,13 @@ Foam::label Foam::cellMapper::sizeBeforeMapping() const
 }
 
 
-const Foam::unallocLabelList& Foam::cellMapper::directAddressing() const
+const Foam::labelUList& Foam::cellMapper::directAddressing() const
 {
     if (!direct())
     {
         FatalErrorIn
         (
-            "const unallocLabelList& cellMapper::directAddressing() const"
+            "const labelUList& cellMapper::directAddressing() const"
         )   << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
index 10fd09cddb..9f05f393c9 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
@@ -131,7 +131,7 @@ public:
         }
 
         //- Return direct addressing
-        virtual const unallocLabelList& directAddressing() const;
+        virtual const labelUList& directAddressing() const;
 
         //- Return interpolated addressing
         virtual const labelListList& addressing() const;
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index 6377fefedd..9104231352 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -302,13 +302,13 @@ Foam::label Foam::faceMapper::internalSizeBeforeMapping() const
 }
 
 
-const Foam::unallocLabelList& Foam::faceMapper::directAddressing() const
+const Foam::labelUList& Foam::faceMapper::directAddressing() const
 {
     if (!direct())
     {
         FatalErrorIn
         (
-            "const unallocLabelList& faceMapper::directAddressing() const"
+            "const labelUList& faceMapper::directAddressing() const"
         )   << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
index 410e2819e0..4e4830e4dd 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
@@ -135,7 +135,7 @@ public:
         }
 
         //- Return direct addressing
-        virtual const unallocLabelList& directAddressing() const;
+        virtual const labelUList& directAddressing() const;
 
         //- Return interpolated addressing
         virtual const labelListList& addressing() const;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index c11b9056bd..881eed6933 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -805,7 +805,7 @@ void Foam::polyBoundaryMesh::updateMesh()
 }
 
 
-void Foam::polyBoundaryMesh::reorder(const UList<label>& oldToNew)
+void Foam::polyBoundaryMesh::reorder(const labelUList& oldToNew)
 {
     // Change order of patches
     polyPatchList::reorder(oldToNew);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 89bd78a17a..755e649e07 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -188,7 +188,7 @@ public:
         //  ascending or descending order. Reordering has to be unique.
         //  (is shuffle) Calls updateMesh() after reordering to recalculate
         //  data.
-        void reorder(const UList<label>&);
+        void reorder(const labelUList&);
 
         //- writeData member function required by regIOobject
         bool writeData(Ostream&) const;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index 122ee9a791..7bd9149b04 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -421,7 +421,7 @@ Foam::coupledPolyPatch::coupledPolyPatch
     const coupledPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index c2dcbbe6e3..47af3fa3b3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -208,7 +208,7 @@ public:
             const coupledPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
index 94fe6df9ec..647d449f61 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
@@ -98,7 +98,7 @@ Foam::genericPolyPatch::genericPolyPatch
     const genericPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
index d89207b140..f8ba8600f1 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
@@ -111,7 +111,7 @@ public:
             const genericPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -143,7 +143,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 370a90c89e..3dace6a53e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -581,7 +581,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
     const cyclicPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index f628e2c018..9e9e3510ed 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -243,7 +243,7 @@ public:
             const cyclicPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -283,7 +283,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
index f44540f2a3..9d87d0a668 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
@@ -117,7 +117,7 @@ public:
             const cyclicPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         )
         :
@@ -161,7 +161,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
index 8569ed67ca..23a9c379bd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
@@ -91,7 +91,7 @@ Foam::emptyPolyPatch::emptyPolyPatch
     const emptyPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
index 9b6f1812be..9c52b5a1e8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
@@ -97,7 +97,7 @@ public:
             const emptyPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -129,7 +129,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
index b3d65a67c8..6d603ed612 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
@@ -116,7 +116,7 @@ public:
             const nonuniformTransformCyclicPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         )
         :
@@ -162,7 +162,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index ce8322b325..c85a498abd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -129,7 +129,7 @@ Foam::processorPolyPatch::processorPolyPatch
     const processorPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index bda2eb19d6..7861856afd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -166,7 +166,7 @@ public:
             const processorPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -205,7 +205,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index 351ff780fb..6bc517ec25 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -130,7 +130,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
     const processorCyclicPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
index 3206469d8e..fdf4b8e03c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
@@ -173,7 +173,7 @@ public:
             const processorCyclicPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -215,7 +215,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
index ec1d258268..0d0b601bc2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
@@ -91,7 +91,7 @@ Foam::symmetryPolyPatch::symmetryPolyPatch
     const symmetryPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
index 4a910c19ce..7fbcf9481f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
@@ -97,7 +97,7 @@ public:
             const symmetryPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -129,7 +129,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
index 0e2c4e9620..e876374511 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
@@ -164,7 +164,7 @@ Foam::wedgePolyPatch::wedgePolyPatch
     const wedgePolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
index 552735cb9c..6233f4e524 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
@@ -118,7 +118,7 @@ public:
             const wedgePolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -150,7 +150,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
index f8ed338c2a..62925b3014 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
@@ -91,7 +91,7 @@ Foam::wallPolyPatch::wallPolyPatch
     const wallPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
index bd0d03af9d..c6cd9ca664 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
@@ -97,7 +97,7 @@ public:
             const wallPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -129,7 +129,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index aca74ce521..c030abc40a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -171,7 +171,7 @@ Foam::polyPatch::polyPatch
     const polyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
@@ -273,7 +273,7 @@ Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
     // get reference to global cell centres
     const vectorField& gcc = boundaryMesh_.mesh().cellCentres();
 
-    const unallocLabelList& faceCells = this->faceCells();
+    const labelUList& faceCells = this->faceCells();
 
     forAll(faceCells, facei)
     {
@@ -284,7 +284,7 @@ Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
 }
 
 
-const Foam::unallocLabelList& Foam::polyPatch::faceCells() const
+const Foam::labelUList& Foam::polyPatch::faceCells() const
 {
     if (!faceCellsPtr_)
     {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 5449cbf160..4c4c3ac54f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -199,7 +199,7 @@ public:
             const polyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -234,7 +234,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
@@ -331,7 +331,7 @@ public:
         // Addressing into mesh
 
             //- Return face-cell addressing
-            const unallocLabelList& faceCells() const;
+            const labelUList& faceCells() const;
 
             //- Return global edge index for local edges
             const labelList& meshEdges() const;
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
index 2464e98047..7b575db4e6 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
@@ -47,7 +47,7 @@ const char * const Foam::cellZone::labelsName = "cellLabels";
 Foam::cellZone::cellZone
 (
     const word& name,
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const label index,
     const cellZoneMesh& zm
 )
@@ -86,7 +86,7 @@ Foam::cellZone::cellZone
 Foam::cellZone::cellZone
 (
     const cellZone& cz,
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const label index,
     const cellZoneMesh& zm
 )
@@ -154,7 +154,7 @@ void Foam::cellZone::operator=(const cellZone& zn)
 }
 
 
-void Foam::cellZone::operator=(const unallocLabelList& addr)
+void Foam::cellZone::operator=(const labelUList& addr)
 {
     clearAddressing();
     labelList::operator=(addr);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index 71d686339f..16e3b8a3f1 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -113,7 +113,7 @@ public:
         cellZone
         (
             const word& name,
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const label index,
             const cellZoneMesh&
         );
@@ -141,7 +141,7 @@ public:
         cellZone
         (
             const cellZone&,
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const label index,
             const cellZoneMesh&
         );
@@ -169,7 +169,7 @@ public:
         //  and zone mesh
         virtual autoPtr<cellZone> clone
         (
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const label index,
             const cellZoneMesh& zm
         ) const
@@ -226,7 +226,7 @@ public:
         void operator=(const cellZone&);
 
         //- Assign addressing, clearing demand-driven data
-        void operator=(const unallocLabelList&);
+        void operator=(const labelUList&);
 
         //- Assign addressing, clearing demand-driven data
         void operator=(const Xfer<labelList>&);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 47b61806da..7db8062bb2 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -180,7 +180,7 @@ void Foam::faceZone::checkAddressing() const
 Foam::faceZone::faceZone
 (
     const word& name,
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const boolList& fm,
     const label index,
     const faceZoneMesh& zm
@@ -242,7 +242,7 @@ Foam::faceZone::faceZone
 Foam::faceZone::faceZone
 (
     const faceZone& fz,
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const boolList& fm,
     const label index,
     const faceZoneMesh& zm
@@ -392,7 +392,7 @@ void Foam::faceZone::clearAddressing()
 
 void Foam::faceZone::resetAddressing
 (
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const boolList& flipMap
 )
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 19c6cf7ab1..17c1973eb4 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -154,7 +154,7 @@ public:
         faceZone
         (
             const word& name,
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const boolList& fm,
             const label index,
             const faceZoneMesh& zm
@@ -184,7 +184,7 @@ public:
         faceZone
         (
             const faceZone&,
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const boolList& fm,
             const label index,
             const faceZoneMesh&
@@ -214,7 +214,7 @@ public:
         //  and zone mesh
         virtual autoPtr<faceZone> clone
         (
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const boolList& fm,
             const label index,
             const faceZoneMesh& zm
@@ -279,7 +279,7 @@ public:
         virtual void clearAddressing();
 
         //- Reset addressing and flip map (clearing demand-driven data)
-        virtual void resetAddressing(const unallocLabelList&, const boolList&);
+        virtual void resetAddressing(const labelUList&, const boolList&);
 
         //- Check zone definition. Return true if in error.
         virtual bool checkDefinition(const bool report = false) const;
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index 071387bd8d..500ea7ac52 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -47,7 +47,7 @@ const char* const Foam::pointZone::labelsName = "pointLabels";
 Foam::pointZone::pointZone
 (
     const word& name,
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const label index,
     const pointZoneMesh& zm
 )
@@ -86,7 +86,7 @@ Foam::pointZone::pointZone
 Foam::pointZone::pointZone
 (
     const pointZone& pz,
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const label index,
     const pointZoneMesh& zm
 )
@@ -198,7 +198,7 @@ void Foam::pointZone::operator=(const pointZone& zn)
 }
 
 
-void Foam::pointZone::operator=(const unallocLabelList& addr)
+void Foam::pointZone::operator=(const labelUList& addr)
 {
     clearAddressing();
     labelList::operator=(addr);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 858dae3a95..760f7c05ac 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -112,7 +112,7 @@ public:
         pointZone
         (
             const word& name,
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const label index,
             const pointZoneMesh&
         );
@@ -140,7 +140,7 @@ public:
         pointZone
         (
             const pointZone&,
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const label index,
             const pointZoneMesh&
         );
@@ -170,7 +170,7 @@ public:
         (
             const pointZoneMesh& zm,
             const label index,
-            const unallocLabelList& addr
+            const labelUList& addr
         ) const
         {
             return autoPtr<pointZone>
@@ -226,7 +226,7 @@ public:
         void operator=(const pointZone&);
 
         //- Assign addressing, clearing demand-driven data
-        void operator=(const unallocLabelList&);
+        void operator=(const labelUList&);
 
         //- Assign addressing, clearing demand-driven data
         void operator=(const Xfer<labelList>&);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
index 31af839b08..4ee225e5a7 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -85,7 +85,7 @@ void Foam::zone::calcLookupMap() const
 Foam::zone::zone
 (
     const word& name,
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const label index
 )
 :
@@ -128,7 +128,7 @@ Foam::zone::zone
 Foam::zone::zone
 (
     const zone& z,
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const label index
 )
 :
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
index e7f3a920b1..f2363e9511 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -101,7 +101,7 @@ public:
         zone
         (
             const word& name,
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const label index
         );
 
@@ -127,7 +127,7 @@ public:
         zone
         (
             const zone&,
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const label index
         );
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index a0b52f63d1..83babd7016 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -444,8 +444,8 @@ public:
                 static void calcCells
                 (
                     cellList&,
-                    const unallocLabelList& own,
-                    const unallocLabelList& nei,
+                    const labelUList& own,
+                    const labelUList& nei,
                     const label nCells = -1
                 );
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
index 37af41dffc..55f2685885 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
@@ -30,8 +30,8 @@ License
 void Foam::primitiveMesh::calcCells
 (
     cellList& cellFaceAddr,
-    const unallocLabelList& own,
-    const unallocLabelList& nei,
+    const labelUList& own,
+    const labelUList& nei,
     const label inNCells
 )
 {
diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H
index 957d09706e..9f1fa0013e 100644
--- a/src/conversion/ensight/part/ensightPart.H
+++ b/src/conversion/ensight/part/ensightPart.H
@@ -136,7 +136,7 @@ protected:
         (
             ensightFile& os,
             const List<scalar>& field,
-            const List<label>& idList
+            const labelUList& idList
         ) const;
 
         //- track points used
diff --git a/src/conversion/ensight/part/ensightPartIO.C b/src/conversion/ensight/part/ensightPartIO.C
index 3a0020ac83..c3866cdd36 100644
--- a/src/conversion/ensight/part/ensightPartIO.C
+++ b/src/conversion/ensight/part/ensightPartIO.C
@@ -56,7 +56,7 @@ void Foam::ensightPart::writeFieldList
 (
     ensightFile& os,
     const List<scalar>& field,
-    const List<label>& idList
+    const labelUList& idList
 ) const
 {
     forAll(idList, i)
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
index d54e6a242d..2ca6759507 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
@@ -107,7 +107,7 @@ private:
                 return true;
             }
 
-            const unallocLabelList& directAddressing() const
+            const labelUList& directAddressing() const
             {
                 return directAddressing_;
             }
diff --git a/src/errorEstimation/errorEstimate/resErrorDiv.C b/src/errorEstimation/errorEstimate/resErrorDiv.C
index 74f3c1e554..d374b180ea 100644
--- a/src/errorEstimation/errorEstimate/resErrorDiv.C
+++ b/src/errorEstimation/errorEstimate/resErrorDiv.C
@@ -50,8 +50,8 @@ div
     const surfaceVectorField& faceCentres = mesh.Cf();
     const volVectorField& cellCentres = mesh.C();
     const fvPatchList& patches = mesh.boundary();
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     Field<Type> res(vols.size(), pTraits<Type>::zero);
     scalarField aNorm(vols.size(), 0.0);
diff --git a/src/errorEstimation/errorEstimate/resErrorLaplacian.C b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
index aa6a521e74..c310a583b3 100644
--- a/src/errorEstimation/errorEstimate/resErrorLaplacian.C
+++ b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
@@ -124,8 +124,8 @@ laplacian
     const surfaceVectorField& Sf = mesh.Sf();
     const surfaceScalarField magSf = mesh.magSf();
     const fvPatchList& patches = mesh.boundary();
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const surfaceScalarField& delta =
         mesh.surfaceInterpolation::deltaCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index c3949a6ac0..674e89fc32 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -142,7 +142,7 @@ template<class Type>
 tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
 {
     const Field<Type>& iField = this->internalField();
-    const unallocLabelList& nbrFaceCells =
+    const labelUList& nbrFaceCells =
         cyclicPatch().cyclicPatch().neighbPatch().faceCells();
 
     tmp<Field<Type> > tpnf(new Field<Type>(this->size()));
@@ -201,7 +201,7 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
 {
     scalarField pnf(this->size());
 
-    const unallocLabelList& nbrFaceCells =
+    const labelUList& nbrFaceCells =
         cyclicPatch().cyclicPatch().neighbPatch().faceCells();
 
     forAll(pnf, facei)
@@ -213,7 +213,7 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
     transformCoupleField(pnf, cmpt);
 
     // Multiply the field by coefficients and add into the result
-    const unallocLabelList& faceCells = cyclicPatch_.faceCells();
+    const labelUList& faceCells = cyclicPatch_.faceCells();
 
     forAll(faceCells, elemI)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index 0ebe40ee01..ca38f3b30f 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -99,7 +99,7 @@ template<class Type>
 tmp<Field<Type> > jumpCyclicFvPatchField<Type>::patchNeighbourField() const
 {
     const Field<Type>& iField = this->internalField();
-    const unallocLabelList& nbrFaceCells =
+    const labelUList& nbrFaceCells =
         this->cyclicPatch().neighbFvPatch().faceCells();
 
     tmp<Field<Type> > tpnf(new Field<Type>(this->size()));
@@ -147,7 +147,7 @@ void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
 {
     scalarField pnf(this->size());
 
-    const unallocLabelList& nbrFaceCells =
+    const labelUList& nbrFaceCells =
         this->cyclicPatch().neighbFvPatch().faceCells();
 
     if (&psiInternal == &this->internalField())
@@ -176,7 +176,7 @@ void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
     this->transformCoupleField(pnf, cmpt);
 
     // Multiply the field by coefficients and add into the result
-    const unallocLabelList& faceCells = this->cyclicPatch().faceCells();
+    const labelUList& faceCells = this->cyclicPatch().faceCells();
     forAll(faceCells, elemI)
     {
         result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 733654344f..7c938afd18 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -244,7 +244,7 @@ void processorFvPatchField<Type>::updateInterfaceMatrix
 
     // Multiply the field by coefficients and add into the result
 
-    const unallocLabelList& faceCells = this->patch().faceCells();
+    const labelUList& faceCells = this->patch().faceCells();
 
     forAll(faceCells, elemI)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
index 1171259fa0..24b54aedf0 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
@@ -67,7 +67,7 @@ void processorFvPatchField<scalar>::updateInterfaceMatrix
         procPatch_.compressedReceive<scalar>(commsType, this->size())()
     );
 
-    const unallocLabelList& faceCells = patch().faceCells();
+    const labelUList& faceCells = patch().faceCells();
 
     forAll(faceCells, facei)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 22394cc17f..48cc8d4251 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -264,7 +264,7 @@ processorCyclicFvPatchField<Type>::~processorCyclicFvPatchField()
 //
 //    // Multiply the field by coefficients and add into the result
 //
-//    const unallocLabelList& faceCells = this->patch().faceCells();
+//    const labelUList& faceCells = this->patch().faceCells();
 //
 //    forAll(faceCells, elemI)
 //    {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
index 51daf57629..cb047d7c0d 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
@@ -67,7 +67,7 @@ namespace Foam
 //        procPatch_.compressedReceive<scalar>(commsType, this->size())()
 //    );
 //
-//    const unallocLabelList& faceCells = patch().faceCells();
+//    const labelUList& faceCells = patch().faceCells();
 //
 //    forAll(faceCells, facei)
 //    {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 88bc0b0afd..654a260ef5 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -63,8 +63,8 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
 
     volScalarField& corDeltaT = tcorDeltaT();
 
-    const unallocLabelList& owner = mesh().owner();
-    const unallocLabelList& neighbour = mesh().neighbour();
+    const labelUList& owner = mesh().owner();
+    const labelUList& neighbour = mesh().neighbour();
 
     forAll(owner, faceI)
     {
@@ -81,7 +81,7 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
             cofrDeltaT.boundaryField()[patchi];
 
         const fvPatch& p = pcofrDeltaT.patch();
-        const unallocLabelList& faceCells = p.patch().faceCells();
+        const labelUList& faceCells = p.patch().faceCells();
 
         forAll(pcofrDeltaT, patchFacei)
         {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index 1c150a2cbd..8b5fe573a2 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -46,8 +46,8 @@ void SLTSDdtScheme<Type>::relaxedDiag
     const surfaceScalarField& phi
 ) const
 {
-    const unallocLabelList& owner = mesh().owner();
-    const unallocLabelList& neighbour = mesh().neighbour();
+    const labelUList& owner = mesh().owner();
+    const labelUList& neighbour = mesh().neighbour();
     scalarField diag(rD.size(), 0.0);
 
     forAll(owner, faceI)
@@ -67,7 +67,7 @@ void SLTSDdtScheme<Type>::relaxedDiag
     forAll(phi.boundaryField(), patchi)
     {
         const fvsPatchScalarField& pphi = phi.boundaryField()[patchi];
-        const unallocLabelList& faceCells = pphi.patch().patch().faceCells();
+        const labelUList& faceCells = pphi.patch().patch().faceCells();
 
         forAll(pphi, patchFacei)
         {
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
index 4ef505b3f9..dd803cec72 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
@@ -45,8 +45,8 @@ void Foam::fvc::smooth
     DynamicList<label> changedFaces(mesh.nFaces()/100 + 100);
     DynamicList<smoothData> changedFacesInfo(changedFaces.size());
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     forAll(owner, facei)
     {
@@ -146,8 +146,8 @@ void Foam::fvc::spread
     // Set initial field on faces
     List<smoothData> faceData(mesh.nFaces());
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     forAll(owner, facei)
     {
@@ -248,8 +248,8 @@ void Foam::fvc::sweep
     // Set initial field on faces
     List<sweepData> faceData(mesh.nFaces());
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
     const vectorField& Cf = mesh.faceCentres();
 
     forAll(owner, facei)
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index 595d59dcba..5cbed1fc17 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -48,8 +48,8 @@ void surfaceIntegrate
 {
     const fvMesh& mesh = ssf.mesh();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const Field<Type>& issf = ssf;
 
@@ -61,7 +61,7 @@ void surfaceIntegrate
 
     forAll(mesh.boundary(), patchi)
     {
-        const unallocLabelList& pFaceCells =
+        const labelUList& pFaceCells =
             mesh.boundary()[patchi].faceCells();
 
         const fvsPatchField<Type>& pssf = ssf.boundaryField()[patchi];
@@ -160,8 +160,8 @@ surfaceSum
     );
     GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     forAll(owner, facei)
     {
@@ -171,7 +171,7 @@ surfaceSum
 
     forAll(mesh.boundary(), patchi)
     {
-        const unallocLabelList& pFaceCells =
+        const labelUList& pFaceCells =
             mesh.boundary()[patchi].faceCells();
 
         const fvsPatchField<Type>& pssf = ssf.boundaryField()[patchi];
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.C
index 70434b69e2..722bbf3290 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.C
@@ -88,8 +88,8 @@ Foam::fv::extendedLeastSquaresGrad<Type>::calcGrad
     const surfaceVectorField& ownLs = lsv.pVectors();
     const surfaceVectorField& neiLs = lsv.nVectors();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     forAll(owner, facei)
     {
@@ -107,7 +107,7 @@ Foam::fv::extendedLeastSquaresGrad<Type>::calcGrad
     {
         const fvsPatchVectorField& patchOwnLs = ownLs.boundaryField()[patchi];
 
-        const unallocLabelList& faceCells =
+        const labelUList& faceCells =
             lsGrad.boundaryField()[patchi].patch().faceCells();
 
         if (vsf.boundaryField()[patchi].coupled())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
index 5ac9121284..54da2b8bc2 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
@@ -107,8 +107,8 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
     surfaceVectorField& lsN = *nVectorsPtr_;
 
     // Set local references to mesh data
-    const unallocLabelList& owner = mesh_.owner();
-    const unallocLabelList& neighbour = mesh_.neighbour();
+    const labelUList& owner = mesh_.owner();
+    const labelUList& neighbour = mesh_.neighbour();
 
     // Build the d-vectors
     surfaceVectorField d = mesh_.Sf()/(mesh_.magSf()*mesh_.deltaCoeffs());
@@ -137,7 +137,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
         const fvsPatchVectorField& pd = d.boundaryField()[patchI];
 
         const fvPatch& p = pd.patch();
-        const unallocLabelList& faceCells = p.faceCells();
+        const labelUList& faceCells = p.faceCells();
 
         forAll(pd, patchFaceI)
         {
@@ -245,7 +245,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
         fvsPatchVectorField& patchLsP = lsP.boundaryField()[patchI];
 
         const fvPatch& p = patchLsP.patch();
-        const unallocLabelList& faceCells = p.faceCells();
+        const labelUList& faceCells = p.faceCells();
 
         forAll(p, patchFaceI)
         {
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
index faa7fe5be2..efbacc24aa 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
@@ -93,8 +93,8 @@ Foam::fv::fourthGrad<Type>::calcGrad
     const surfaceVectorField& neiLs = lsv.nVectors();
 
     // owner/neighbour addressing
-    const unallocLabelList& own = mesh.owner();
-    const unallocLabelList& nei = mesh.neighbour();
+    const labelUList& own = mesh.owner();
+    const labelUList& nei = mesh.neighbour();
 
     // Assemble the fourth-order gradient
 
@@ -135,7 +135,7 @@ Foam::fv::fourthGrad<Type>::calcGrad
                      /mesh.deltaCoeffs().boundaryField()[patchi];
             }
 
-            const unallocLabelList& faceCells =
+            const labelUList& faceCells =
                 fGrad.boundaryField()[patchi].patch().faceCells();
 
             Field<GradType> neighbourSecondfGrad =
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index cbc140a6bb..562285d2d0 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -72,8 +72,8 @@ Foam::fv::gaussGrad<Type>::gradf
     );
     GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
     const vectorField& Sf = mesh.Sf();
 
     Field<GradType>& igGrad = gGrad;
@@ -89,7 +89,7 @@ Foam::fv::gaussGrad<Type>::gradf
 
     forAll(mesh.boundary(), patchi)
     {
-        const unallocLabelList& pFaceCells =
+        const labelUList& pFaceCells =
             mesh.boundary()[patchi].faceCells();
 
         const vectorField& pSf = mesh.Sf().boundaryField()[patchi];
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index 4cb697e9db..708d578779 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -84,8 +84,8 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
     const surfaceVectorField& ownLs = lsv.pVectors();
     const surfaceVectorField& neiLs = lsv.nVectors();
 
-    const unallocLabelList& own = mesh.owner();
-    const unallocLabelList& nei = mesh.neighbour();
+    const labelUList& own = mesh.owner();
+    const labelUList& nei = mesh.neighbour();
 
     forAll(own, facei)
     {
@@ -103,7 +103,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
     {
         const fvsPatchVectorField& patchOwnLs = ownLs.boundaryField()[patchi];
 
-        const unallocLabelList& faceCells =
+        const labelUList& faceCells =
             lsGrad.boundaryField()[patchi].patch().faceCells();
 
         if (vsf.boundaryField()[patchi].coupled())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index ac721ce8a2..b6735d4834 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -97,8 +97,8 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
     surfaceVectorField& lsN = *nVectorsPtr_;
 
     // Set local references to mesh data
-    const unallocLabelList& owner = mesh_.owner();
-    const unallocLabelList& neighbour = mesh_.neighbour();
+    const labelUList& owner = mesh_.owner();
+    const labelUList& neighbour = mesh_.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceScalarField& w = mesh.weights();
@@ -127,7 +127,7 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
         const fvsPatchScalarField& pMagSf = magSf.boundaryField()[patchi];
 
         const fvPatch& p = pw.patch();
-        const unallocLabelList& faceCells = p.patch().faceCells();
+        const labelUList& faceCells = p.patch().faceCells();
 
         // Build the d-vectors
         vectorField pd =
@@ -191,7 +191,7 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
         const fvsPatchScalarField& pMagSf = magSf.boundaryField()[patchi];
 
         const fvPatch& p = pw.patch();
-        const unallocLabelList& faceCells = p.faceCells();
+        const labelUList& faceCells = p.faceCells();
 
         // Build the d-vectors
         vectorField pd =
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
index d679586bae..7fa5683a95 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
@@ -62,8 +62,8 @@ Foam::fv::cellLimitedGrad<Foam::scalar>::calcGrad
 
     volVectorField& g = tGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -93,7 +93,7 @@ Foam::fv::cellLimitedGrad<Foam::scalar>::calcGrad
     {
         const fvPatchScalarField& psf = bsf[patchi];
 
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
 
         if (psf.coupled())
         {
@@ -164,7 +164,7 @@ Foam::fv::cellLimitedGrad<Foam::scalar>::calcGrad
 
     forAll(bsf, patchi)
     {
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
         const vectorField& pCf = Cf.boundaryField()[patchi];
 
         forAll(pOwner, pFacei)
@@ -216,8 +216,8 @@ Foam::fv::cellLimitedGrad<Foam::vector>::calcGrad
 
     volTensorField& g = tGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -246,7 +246,7 @@ Foam::fv::cellLimitedGrad<Foam::vector>::calcGrad
     forAll(bsf, patchi)
     {
         const fvPatchVectorField& psf = bsf[patchi];
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
 
         if (psf.coupled())
         {
@@ -317,7 +317,7 @@ Foam::fv::cellLimitedGrad<Foam::vector>::calcGrad
 
     forAll(bsf, patchi)
     {
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
         const vectorField& pCf = Cf.boundaryField()[patchi];
 
         forAll(pOwner, pFacei)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
index e5d1881f84..2a1fa06e64 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
@@ -63,8 +63,8 @@ Foam::fv::cellMDLimitedGrad<Foam::scalar>::calcGrad
 
     volVectorField& g = tGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -94,7 +94,7 @@ Foam::fv::cellMDLimitedGrad<Foam::scalar>::calcGrad
     {
         const fvPatchScalarField& psf = bsf[patchi];
 
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
 
         if (psf.coupled())
         {
@@ -163,7 +163,7 @@ Foam::fv::cellMDLimitedGrad<Foam::scalar>::calcGrad
 
     forAll(bsf, patchi)
     {
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
         const vectorField& pCf = Cf.boundaryField()[patchi];
 
         forAll(pOwner, pFacei)
@@ -206,8 +206,8 @@ Foam::fv::cellMDLimitedGrad<Foam::vector>::calcGrad
 
     volTensorField& g = tGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -236,7 +236,7 @@ Foam::fv::cellMDLimitedGrad<Foam::vector>::calcGrad
     forAll(bsf, patchi)
     {
         const fvPatchVectorField& psf = bsf[patchi];
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
 
         if (psf.coupled())
         {
@@ -305,7 +305,7 @@ Foam::fv::cellMDLimitedGrad<Foam::vector>::calcGrad
 
     forAll(bsf, patchi)
     {
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
         const vectorField& pCf = Cf.boundaryField()[patchi];
 
         forAll(pOwner, pFacei)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
index eaad2c97a2..febc19eb17 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
@@ -63,8 +63,8 @@ Foam::fv::faceLimitedGrad<Foam::scalar>::calcGrad
 
     volVectorField& g = tGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -111,7 +111,7 @@ Foam::fv::faceLimitedGrad<Foam::scalar>::calcGrad
     {
         const fvPatchScalarField& psf = bsf[patchi];
 
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
         const vectorField& pCf = Cf.boundaryField()[patchi];
 
         if (psf.coupled())
@@ -199,8 +199,8 @@ Foam::fv::faceLimitedGrad<Foam::vector>::calcGrad
 
     volTensorField& g = tGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -262,7 +262,7 @@ Foam::fv::faceLimitedGrad<Foam::vector>::calcGrad
     {
         const fvPatchVectorField& psf = bvf[patchi];
 
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
         const vectorField& pCf = Cf.boundaryField()[patchi];
 
         if (psf.coupled())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
index 0d557ba44d..906324e0eb 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
@@ -63,8 +63,8 @@ Foam::fv::faceMDLimitedGrad<Foam::scalar>::calcGrad
 
     volVectorField& g = tGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -114,7 +114,7 @@ Foam::fv::faceMDLimitedGrad<Foam::scalar>::calcGrad
     {
         const fvPatchScalarField& psf = bsf[patchi];
 
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
         const vectorField& pCf = Cf.boundaryField()[patchi];
 
         if (psf.coupled())
@@ -203,8 +203,8 @@ Foam::fv::faceMDLimitedGrad<Foam::vector>::calcGrad
 
     volTensorField& g = tGrad();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
@@ -256,7 +256,7 @@ Foam::fv::faceMDLimitedGrad<Foam::vector>::calcGrad
     {
         const fvPatchVectorField& psf = bvf[patchi];
 
-        const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+        const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
         const vectorField& pCf = Cf.boundaryField()[patchi];
 
         if (psf.coupled())
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index bba48999f0..758aa3f5b6 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -133,8 +133,8 @@ snGradScheme<Type>::snGrad
     const scalarField& deltaCoeffs = tdeltaCoeffs().internalField();
 
     // owner/neighbour addressing
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     forAll(owner, faceI)
     {
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 21c53e4381..b0c18e3c68 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -36,7 +36,7 @@ template<class Type>
 template<class Type2>
 void Foam::fvMatrix<Type>::addToInternalField
 (
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const Field<Type2>& pf,
     Field<Type2>& intf
 ) const
@@ -45,7 +45,7 @@ void Foam::fvMatrix<Type>::addToInternalField
     {
         FatalErrorIn
         (
-            "fvMatrix<Type>::addToInternalField(const unallocLabelList&, "
+            "fvMatrix<Type>::addToInternalField(const labelUList&, "
             "const Field&, Field&)"
         )   << "sizes of addressing and field are different"
             << abort(FatalError);
@@ -62,7 +62,7 @@ template<class Type>
 template<class Type2>
 void Foam::fvMatrix<Type>::addToInternalField
 (
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const tmp<Field<Type2> >& tpf,
     Field<Type2>& intf
 ) const
@@ -76,7 +76,7 @@ template<class Type>
 template<class Type2>
 void Foam::fvMatrix<Type>::subtractFromInternalField
 (
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const Field<Type2>& pf,
     Field<Type2>& intf
 ) const
@@ -85,7 +85,7 @@ void Foam::fvMatrix<Type>::subtractFromInternalField
     {
         FatalErrorIn
         (
-            "fvMatrix<Type>::addToInternalField(const unallocLabelList&, "
+            "fvMatrix<Type>::addToInternalField(const labelUList&, "
             "const Field&, Field&)"
         )   << "sizes of addressing and field are different"
             << abort(FatalError);
@@ -102,7 +102,7 @@ template<class Type>
 template<class Type2>
 void Foam::fvMatrix<Type>::subtractFromInternalField
 (
-    const unallocLabelList& addr,
+    const labelUList& addr,
     const tmp<Field<Type2> >& tpf,
     Field<Type2>& intf
 ) const
@@ -167,7 +167,7 @@ void Foam::fvMatrix<Type>::addBoundarySource
             tmp<Field<Type> > tpnf = ptf.patchNeighbourField();
             const Field<Type>& pnf = tpnf();
 
-            const unallocLabelList& addr = lduAddr().patchAddr(patchI);
+            const labelUList& addr = lduAddr().patchAddr(patchI);
 
             forAll(addr, facei)
             {
@@ -182,15 +182,15 @@ template<class Type>
 template<template<class> class ListType>
 void Foam::fvMatrix<Type>::setValuesFromList
 (
-    const unallocLabelList& cellLabels,
+    const labelUList& cellLabels,
     const ListType<Type>& values
 )
 {
     const fvMesh& mesh = psi_.mesh();
 
     const cellList& cells = mesh.cells();
-    const unallocLabelList& own = mesh.owner();
-    const unallocLabelList& nei = mesh.neighbour();
+    const labelUList& own = mesh.owner();
+    const labelUList& nei = mesh.neighbour();
 
     scalarField& Diag = diag();
     Field<Type>& psi =
@@ -486,7 +486,7 @@ Foam::fvMatrix<Type>::~fvMatrix()
 template<class Type>
 void Foam::fvMatrix<Type>::setValues
 (
-    const unallocLabelList& cellLabels,
+    const labelUList& cellLabels,
     const UList<Type>& values
 )
 {
@@ -497,7 +497,7 @@ void Foam::fvMatrix<Type>::setValues
 template<class Type>
 void Foam::fvMatrix<Type>::setValues
 (
-    const unallocLabelList& cellLabels,
+    const labelUList& cellLabels,
     const UIndirectList<Type>& values
 )
 {
@@ -553,7 +553,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
 
         if (ptf.size())
         {
-            const unallocLabelList& pa = lduAddr().patchAddr(patchI);
+            const labelUList& pa = lduAddr().patchAddr(patchI);
             Field<Type>& iCoeffs = internalCoeffs_[patchI];
 
             if (ptf.coupled())
@@ -600,7 +600,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
 
         if (ptf.size())
         {
-            const unallocLabelList& pa = lduAddr().patchAddr(patchI);
+            const labelUList& pa = lduAddr().patchAddr(patchI);
             Field<Type>& iCoeffs = internalCoeffs_[patchI];
 
             if (ptf.coupled())
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 2b8fa3c6ee..adff2f03b9 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -150,7 +150,7 @@ protected:
         template<class Type2>
         void addToInternalField
         (
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const Field<Type2>& pf,
             Field<Type2>& intf
         ) const;
@@ -158,7 +158,7 @@ protected:
         template<class Type2>
         void addToInternalField
         (
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const tmp<Field<Type2> >& tpf,
             Field<Type2>& intf
         ) const;
@@ -167,7 +167,7 @@ protected:
         template<class Type2>
         void subtractFromInternalField
         (
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const Field<Type2>& pf,
             Field<Type2>& intf
         ) const;
@@ -175,7 +175,7 @@ protected:
         template<class Type2>
         void subtractFromInternalField
         (
-            const unallocLabelList& addr,
+            const labelUList& addr,
             const tmp<Field<Type2> >& tpf,
             Field<Type2>& intf
         ) const;
@@ -203,7 +203,7 @@ protected:
             template<template<class> class ListType>
             void setValuesFromList
             (
-                const unallocLabelList& cells,
+                const labelUList& cells,
                 const ListType<Type>& values
             );
 
@@ -327,7 +327,7 @@ public:
             //  and eliminate the corresponding equations from the matrix.
             void setValues
             (
-                const unallocLabelList& cells,
+                const labelUList& cells,
                 const UList<Type>& values
             );
 
@@ -335,7 +335,7 @@ public:
             //  and eliminate the corresponding equations from the matrix.
             void setValues
             (
-                const unallocLabelList& cells,
+                const labelUList& cells,
                 const UIndirectList<Type>& values
             );
 
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 0b0acc68f5..eafec93b65 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -324,8 +324,8 @@ void Foam::MULES::limiter
 
     const fvMesh& mesh = psi.mesh();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighb = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighb = mesh.neighbour();
     tmp<volScalarField::DimensionedInternalField> tVsc = mesh.Vsc();
     const scalarField& V = tVsc();
     const scalar deltaT = mesh.time().deltaTValue();
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index dae61ddc4c..55af1e68bb 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -253,13 +253,13 @@ public:
             }
 
             //- Internal face owner
-            const unallocLabelList& owner() const
+            const labelUList& owner() const
             {
                 return lduAddr().lowerAddr();
             }
 
             //- Internal face neighbour
-            const unallocLabelList& neighbour() const
+            const labelUList& neighbour() const
             {
                 return lduAddr().upperAddr();
             }
diff --git a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
index 6ecc9a17ae..20954aeb36 100644
--- a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
+++ b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
@@ -110,19 +110,19 @@ public:
     // Member Functions
 
         //- Return lower addressing (i.e. lower label = upper triangle)
-        const unallocLabelList& lowerAddr() const
+        const labelUList& lowerAddr() const
         {
             return lowerAddr_;
         }
 
         //- Return upper addressing (i.e. upper label)
-        const unallocLabelList& upperAddr() const
+        const labelUList& upperAddr() const
         {
             return upperAddr_;
         }
 
         //- Return patch addressing
-        const unallocLabelList& patchAddr(const label i) const
+        const labelUList& patchAddr(const label i) const
         {
             return *patchAddr_[i];
         }
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index 2bb3a98955..1a805bd83d 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -231,13 +231,13 @@ Foam::fvPatchMapper::~fvPatchMapper()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::unallocLabelList& Foam::fvPatchMapper::directAddressing() const
+const Foam::labelUList& Foam::fvPatchMapper::directAddressing() const
 {
     if (!direct())
     {
         FatalErrorIn
         (
-            "const unallocLabelList& fvPatchMapper::directAddressing() const"
+            "const labelUList& fvPatchMapper::directAddressing() const"
         )   << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
index 82212c5a91..2865d90eff 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
@@ -139,7 +139,7 @@ public:
         }
 
         //- Return direct addressing
-        virtual const unallocLabelList& directAddressing() const;
+        virtual const labelUList& directAddressing() const;
 
         //- Return interpolated addressing
         virtual const labelListList& addressing() const;
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index eb17196720..f11229cb6e 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -170,13 +170,13 @@ Foam::fvSurfaceMapper::~fvSurfaceMapper()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::unallocLabelList& Foam::fvSurfaceMapper::directAddressing() const
+const Foam::labelUList& Foam::fvSurfaceMapper::directAddressing() const
 {
     if (!direct())
     {
         FatalErrorIn
         (
-            "const unallocLabelList& fvSurfaceMapper::"
+            "const labelUList& fvSurfaceMapper::"
             "directAddressing() const"
         )   << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
index 564874194e..540439ef42 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
@@ -134,7 +134,7 @@ public:
         }
 
         //- Return direct addressing
-        virtual const unallocLabelList& directAddressing() const;
+        virtual const labelUList& directAddressing() const;
 
         //- Return interpolated addressing
         virtual const labelListList& addressing() const;
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
index dea6f81a4a..45c47b828c 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
@@ -110,7 +110,7 @@ public:
                 return true;
             }
 
-            const unallocLabelList& directAddressing() const
+            const labelUList& directAddressing() const
             {
                 return directAddressing_;
             }
@@ -151,7 +151,7 @@ public:
                 return true;
             }
 
-            const unallocLabelList& directAddressing() const
+            const labelUList& directAddressing() const
             {
                 return directAddressing_;
             }
diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
index 62315f6697..842ab72bd6 100644
--- a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
@@ -113,7 +113,7 @@ public:
             virtual const tensorField& reverseT() const = 0;
 
             //- Return faceCell addressing
-            virtual const unallocLabelList& faceCells() const
+            virtual const labelUList& faceCells() const
             {
                 return fvPatch::faceCells();
             }
@@ -128,14 +128,14 @@ public:
             //  the interface as a field
             virtual tmp<labelField> interfaceInternalField
             (
-                const unallocLabelList& internalData
+                const labelUList& internalData
             ) const = 0;
 
             //- Initialise neighbour field transfer
             virtual void initInternalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                unallocLabelList& iF
+                labelUList& iF
             ) const
             {}
 
@@ -143,7 +143,7 @@ public:
             virtual tmp<labelField> internalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& iF
+                const labelUList& iF
             ) const = 0;
 };
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
index 2e0a07a787..bdf117c3a5 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
@@ -129,7 +129,7 @@ tmp<vectorField> cyclicFvPatch::delta() const
 
 tmp<labelField> cyclicFvPatch::interfaceInternalField
 (
-    const unallocLabelList& internalData
+    const labelUList& internalData
 ) const
 {
     return patchInternalField(internalData);
@@ -139,7 +139,7 @@ tmp<labelField> cyclicFvPatch::interfaceInternalField
 tmp<labelField> cyclicFvPatch::internalFieldTransfer
 (
     const Pstream::commsTypes commsType,
-    const unallocLabelList& iF
+    const labelUList& iF
 ) const
 {
     return neighbFvPatch().patchInternalField(iF);
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
index b12e3d347b..b992037bda 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
@@ -153,14 +153,14 @@ public:
             //  the interface as a field
             virtual tmp<labelField> interfaceInternalField
             (
-                const unallocLabelList& internalData
+                const labelUList& internalData
             ) const;
 
             //- Return neighbour field
             virtual tmp<labelField> internalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& internalData
+                const labelUList& internalData
             ) const;
 };
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.C
index 12fd10ad45..1b283449e3 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.C
@@ -56,7 +56,7 @@ emptyFvPatch::emptyFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const unallocLabelList& emptyFvPatch::faceCells() const
+const labelUList& emptyFvPatch::faceCells() const
 {
     return faceCells_;
 }
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.H
index eee1837cbb..da5255a95b 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.H
@@ -80,7 +80,7 @@ public:
             }
 
             //- Return faceCells
-            virtual const unallocLabelList& faceCells() const;
+            virtual const labelUList& faceCells() const;
 };
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
index 2d1a23c806..09653153da 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
@@ -115,7 +115,7 @@ tmp<vectorField> processorFvPatch::delta() const
 
 tmp<labelField> processorFvPatch::interfaceInternalField
 (
-    const unallocLabelList& internalData
+    const labelUList& internalData
 ) const
 {
     return patchInternalField(internalData);
@@ -125,7 +125,7 @@ tmp<labelField> processorFvPatch::interfaceInternalField
 void processorFvPatch::initInternalFieldTransfer
 (
     const Pstream::commsTypes commsType,
-    const unallocLabelList& iF
+    const labelUList& iF
 ) const
 {
     send(commsType, patchInternalField(iF)());
@@ -135,7 +135,7 @@ void processorFvPatch::initInternalFieldTransfer
 tmp<labelField> processorFvPatch::internalFieldTransfer
 (
     const Pstream::commsTypes commsType,
-    const unallocLabelList&
+    const labelUList&
 ) const
 {
     return receive<label>(commsType, this->size());
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
index 0f20317753..47b7bd8930 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
@@ -151,21 +151,21 @@ public:
             //  the interface as a field
             virtual tmp<labelField> interfaceInternalField
             (
-                const unallocLabelList& internalData
+                const labelUList& internalData
             ) const;
 
             //- Initialise neighbour field transfer
             virtual void initInternalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& internalData
+                const labelUList& internalData
             ) const;
 
             //- Return neighbour field
             virtual tmp<labelField> internalFieldTransfer
             (
                 const Pstream::commsTypes commsType,
-                const unallocLabelList& internalData
+                const labelUList& internalData
             ) const;
 };
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index 0b42c7f6bb..927249ac53 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -89,7 +89,7 @@ Foam::wordList Foam::fvPatch::constraintTypes()
 }
 
 
-const Foam::unallocLabelList& Foam::fvPatch::faceCells() const
+const Foam::labelUList& Foam::fvPatch::faceCells() const
 {
     return polyPatch_.faceCells();
 }
@@ -106,7 +106,7 @@ Foam::tmp<Foam::vectorField> Foam::fvPatch::Cn() const
     tmp<vectorField> tcc(new vectorField(size()));
     vectorField& cc = tcc();
 
-    const unallocLabelList& faceCells = this->faceCells();
+    const labelUList& faceCells = this->faceCells();
 
     // get reference to global cell centres
     const vectorField& gcc = boundaryMesh().mesh().cellCentres();
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index 7d9cd8a7b9..c32d333a36 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -199,7 +199,7 @@ public:
             }
 
             //- Return faceCells
-            virtual const unallocLabelList& faceCells() const;
+            virtual const labelUList& faceCells() const;
 
 
         // Access functions for geometrical data
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
index 398fba0170..fb8d0c94bd 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
@@ -36,7 +36,7 @@ Foam::tmp<Foam::Field<Type> > Foam::fvPatch::patchInternalField
     tmp<Field<Type> > tpif(new Field<Type>(size()));
     Field<Type>& pif = tpif();
 
-    const unallocLabelList& faceCells = this->faceCells();
+    const labelUList& faceCells = this->faceCells();
 
     forAll(pif, facei)
     {
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
index 184be0a566..c2e4eb838f 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
@@ -94,12 +94,12 @@ public:
         {
             // Private data
 
-                const unallocLabelList& directAddressing_;
+                const labelUList& directAddressing_;
 
         public:
 
                 //- Construct given addressing
-                directPatchFieldMapper(const unallocLabelList& directAddressing)
+                directPatchFieldMapper(const labelUList& directAddressing)
                 :
                     directAddressing_(directAddressing)
                 {}
@@ -114,7 +114,7 @@ public:
                     return true;
                 }
 
-                virtual const unallocLabelList& directAddressing() const
+                virtual const labelUList& directAddressing() const
                 {
                     return directAddressing_;
                 }
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
index a5fffd975b..7a5907de4a 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
@@ -57,7 +57,7 @@ void Foam::nearWallDist::doAll()
         {
             const polyPatch& pPatch = patch.patch();
 
-            const unallocLabelList& faceCells = patch.faceCells();
+            const labelUList& faceCells = patch.faceCells();
 
             // Check cells with face on wall
             forAll(patch, patchFaceI)
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
index e196158294..94bc67a1d0 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
@@ -41,7 +41,7 @@ void Foam::nearWallDistNoSearch::doAll()
 
         if (isA<wallFvPatch>(patches[patchI]))
         {
-            const unallocLabelList& faceCells = patches[patchI].faceCells();
+            const labelUList& faceCells = patches[patchI].faceCells();
 
             const fvPatchVectorField& patchCentres
                 = cellCentres.boundaryField()[patchI];
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 8dacd9545e..be8ca144ae 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -72,8 +72,8 @@ tmp<surfaceScalarField> LimitedScheme<Type, Limiter, LimitFunc>::limiter
 
     const surfaceScalarField& CDweights = mesh.surfaceInterpolation::weights();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     const vectorField& C = mesh.C();
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
index f2ad61bfb2..8df15c9726 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
@@ -65,8 +65,8 @@ tmp<surfaceScalarField> PhiScheme<Type, PhiLimiter>::limiter
     const surfaceVectorField& Sf = mesh.Sf();
     const surfaceScalarField& magSf = mesh.magSf();
 
-    const unallocLabelList& owner = mesh.owner();
-    const unallocLabelList& neighbour = mesh.neighbour();
+    const labelUList& owner = mesh.owner();
+    const labelUList& neighbour = mesh.neighbour();
 
     tmp<surfaceScalarField> tUflux = this->faceFlux_;
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C
index 467614652a..07f81f4ab3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C
@@ -107,7 +107,7 @@ Foam::linearUpwind<Type>::correction
 
         if (pSfCorr.coupled())
         {
-            const unallocLabelList& pOwner =
+            const labelUList& pOwner =
                 mesh.boundary()[patchi].faceCells();
 
             const vectorField& pCf = Cf.boundaryField()[patchi];
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
index 32bca7b54c..cf107e6d96 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
@@ -147,8 +147,8 @@ public:
                 vff.boundaryField()[patchi] = vf.boundaryField()[patchi];
             }
 
-            const unallocLabelList& own = mesh.owner();
-            const unallocLabelList& nei = mesh.neighbour();
+            const labelUList& own = mesh.owner();
+            const labelUList& nei = mesh.neighbour();
 
             forAll(vff, facei)
             {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
index e6fa28cbaf..e3e7e27da9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
@@ -147,8 +147,8 @@ public:
                 vff.boundaryField()[patchi] = vf.boundaryField()[patchi];
             }
 
-            const unallocLabelList& own = mesh.owner();
-            const unallocLabelList& nei = mesh.neighbour();
+            const labelUList& own = mesh.owner();
+            const labelUList& nei = mesh.neighbour();
 
             forAll(vff, facei)
             {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
index 0da3c4c638..f434d6e62b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
@@ -81,7 +81,7 @@ void Foam::skewCorrectionVectors::makeSkewCorrectionVectors() const
     const surfaceVectorField& Cf = mesh_.Cf();
     const surfaceVectorField& Sf = mesh_.Sf();
 
-    const unallocLabelList& owner = mesh_.owner();
+    const labelUList& owner = mesh_.owner();
 
     // Build the d-vectors
     surfaceVectorField d = Sf/(mesh_.magSf()*mesh_.deltaCoeffs());
@@ -112,7 +112,7 @@ void Foam::skewCorrectionVectors::makeSkewCorrectionVectors() const
         else
         {
             const fvPatch& p = patchSkewCorrVecs.patch();
-            const unallocLabelList& faceCells = p.faceCells();
+            const labelUList& faceCells = p.faceCells();
             const vectorField& patchFaceCentres = Cf.boundaryField()[patchI];
             const vectorField& patchSf = Sf.boundaryField()[patchI];
             const vectorField& patchD = d.boundaryField()[patchI];
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 068f9947e2..543b6932c3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -162,8 +162,8 @@ void surfaceInterpolation::makeWeights() const
     // (note that we should not use fvMesh sliced fields at this point yet
     //  since this causes a loop when generating weighting factors in
     //  coupledFvPatchField evaluation phase)
-    const unallocLabelList& owner = mesh_.owner();
-    const unallocLabelList& neighbour = mesh_.neighbour();
+    const labelUList& owner = mesh_.owner();
+    const labelUList& neighbour = mesh_.neighbour();
 
     const vectorField& Cf = mesh_.faceCentres();
     const vectorField& C = mesh_.cellCentres();
@@ -231,8 +231,8 @@ void surfaceInterpolation::makeDeltaCoeffs() const
 
     // Set local references to mesh data
     const volVectorField& C = mesh_.C();
-    const unallocLabelList& owner = mesh_.owner();
-    const unallocLabelList& neighbour = mesh_.neighbour();
+    const labelUList& owner = mesh_.owner();
+    const labelUList& neighbour = mesh_.neighbour();
     const surfaceVectorField& Sf = mesh_.Sf();
     const surfaceScalarField& magSf = mesh_.magSf();
 
@@ -288,8 +288,8 @@ void surfaceInterpolation::makeCorrectionVectors() const
 
     // Set local references to mesh data
     const volVectorField& C = mesh_.C();
-    const unallocLabelList& owner = mesh_.owner();
-    const unallocLabelList& neighbour = mesh_.neighbour();
+    const labelUList& owner = mesh_.owner();
+    const labelUList& neighbour = mesh_.neighbour();
     const surfaceVectorField& Sf = mesh_.Sf();
     const surfaceScalarField& magSf = mesh_.magSf();
     const surfaceScalarField& DeltaCoeffs = deltaCoeffs();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 89e3523435..3f8eb05095 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -184,8 +184,8 @@ surfaceInterpolationScheme<Type>::interpolate
     const scalarField& y = ys.internalField();
 
     const fvMesh& mesh = vf.mesh();
-    const unallocLabelList& P = mesh.owner();
-    const unallocLabelList& N = mesh.neighbour();
+    const labelUList& P = mesh.owner();
+    const labelUList& N = mesh.neighbour();
 
     tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
     (
@@ -263,8 +263,8 @@ surfaceInterpolationScheme<Type>::interpolate
     const scalarField& lambda = lambdas.internalField();
 
     const fvMesh& mesh = vf.mesh();
-    const unallocLabelList& P = mesh.owner();
-    const unallocLabelList& N = mesh.neighbour();
+    const labelUList& P = mesh.owner();
+    const labelUList& N = mesh.neighbour();
 
     tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
     (
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
index 456eaedbc6..33e721cac3 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
@@ -50,8 +50,8 @@ makeCompactCellFaceAddressingAndFaceWeights
     const label nFineCells = fineAddressing.size();
     const label nFineFaces = fineAddressing.upperAddr().size();
 
-    const unallocLabelList& upperAddr = fineAddressing.upperAddr();
-    const unallocLabelList& lowerAddr = fineAddressing.lowerAddr();
+    const labelUList& upperAddr = fineAddressing.upperAddr();
+    const labelUList& lowerAddr = fineAddressing.lowerAddr();
 
     // Number of neighbours for each cell
     labelList nNbrs(nFineCells, 0);
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
index 02db9ad941..62587d26ff 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
@@ -132,7 +132,7 @@ void Foam::inverseFaceDistanceDiffusivity::correct()
     {
         fvsPatchScalarField& bfld = faceDiffusivity_.boundaryField()[patchI];
 
-        const unallocLabelList& faceCells = bfld.patch().faceCells();
+        const labelUList& faceCells = bfld.patch().faceCells();
 
         if (patchSet.found(patchI))
         {
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
index ff49bc7dbb..7ed2a34bba 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
@@ -161,7 +161,7 @@ void Foam::inversePointDistanceDiffusivity::correct()
 
         if (patchSet.found(patchI))
         {
-            const unallocLabelList& faceCells = bfld.patch().faceCells();
+            const labelUList& faceCells = bfld.patch().faceCells();
 
             forAll(bfld, i)
             {
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 3c124b59f3..512c651449 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -89,7 +89,7 @@ void Foam::meshRefinement::calcNeighbourData
     {
         const polyPatch& pp = patches[patchI];
 
-        const unallocLabelList& faceCells = pp.faceCells();
+        const labelUList& faceCells = pp.faceCells();
         const vectorField::subField faceCentres = pp.faceCentres();
         const vectorField::subField faceAreas = pp.faceAreas();
 
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index a5ea0c6b5b..13a294feea 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -73,7 +73,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
 
     forAll(mesh_.boundaryMesh(), patchI)
     {
-        const unallocLabelList& faceCells =
+        const labelUList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
 
         const vectorField::subField faceCentres =
@@ -146,7 +146,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
 
     forAll(mesh_.boundaryMesh(), patchI)
     {
-        const unallocLabelList& faceCells =
+        const labelUList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
 
         const vectorField::subField faceCentres =
@@ -212,7 +212,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
 
     forAll(mesh_.boundaryMesh(), patchI)
     {
-        const unallocLabelList& faceCells =
+        const labelUList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
 
         const vectorField::subField faceCentres =
@@ -283,7 +283,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
 
     forAll(mesh_.boundaryMesh(), patchI)
     {
-        const unallocLabelList& faceCells =
+        const labelUList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
 
         const vectorField::subField faceCentres =
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
index f48abc08eb..f3b679154c 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
@@ -703,7 +703,7 @@ Foam::directMappedPatchBase::directMappedPatchBase
 (
     const polyPatch& pp,
     const directMappedPatchBase& dmp,
-    const unallocLabelList& mapAddressing
+    const labelUList& mapAddressing
 )
 :
     patch_(pp),
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
index 577f014dee..281e24ec6e 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
@@ -177,7 +177,7 @@ public:
         (
             const polyPatch&,
             const directMappedPatchBase&,
-            const unallocLabelList& mapAddressing
+            const labelUList& mapAddressing
         );
 
 
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
index 3d751e17fe..cf2f63b24e 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
@@ -149,7 +149,7 @@ Foam::directMappedPolyPatch::directMappedPolyPatch
     const directMappedPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
index d31abbe063..7598c1959b 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
@@ -161,7 +161,7 @@ public:
             const directMappedPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -193,7 +193,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C
index 78143b912c..1cf56feeb0 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C
@@ -154,7 +154,7 @@ Foam::directMappedWallPolyPatch::directMappedWallPolyPatch
     const directMappedWallPolyPatch& pp,
     const polyBoundaryMesh& bm,
     const label index,
-    const unallocLabelList& mapAddressing,
+    const labelUList& mapAddressing,
     const label newStart
 )
 :
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
index 4fff29f752..60214cf462 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
@@ -161,7 +161,7 @@ public:
             const directMappedWallPolyPatch& pp,
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         );
 
@@ -200,7 +200,7 @@ public:
         (
             const polyBoundaryMesh& bm,
             const label index,
-            const unallocLabelList& mapAddressing,
+            const labelUList& mapAddressing,
             const label newStart
         ) const
         {
diff --git a/src/meshTools/indexedOctree/treeDataCell.C b/src/meshTools/indexedOctree/treeDataCell.C
index 8492f59c4f..e6d6424434 100644
--- a/src/meshTools/indexedOctree/treeDataCell.C
+++ b/src/meshTools/indexedOctree/treeDataCell.C
@@ -84,7 +84,7 @@ Foam::treeDataCell::treeDataCell
 (
     const bool cacheBb,
     const primitiveMesh& mesh,
-    const unallocLabelList& cellLabels
+    const labelUList& cellLabels
 )
 :
     mesh_(mesh),
@@ -171,7 +171,7 @@ bool Foam::treeDataCell::contains
 // nearestPoint.
 void Foam::treeDataCell::findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const point& sample,
 
     scalar& nearestDistSqr,
diff --git a/src/meshTools/indexedOctree/treeDataCell.H b/src/meshTools/indexedOctree/treeDataCell.H
index 4bf5ddb5c2..12ab64e2bf 100644
--- a/src/meshTools/indexedOctree/treeDataCell.H
+++ b/src/meshTools/indexedOctree/treeDataCell.H
@@ -88,7 +88,7 @@ public:
         (
             const bool cacheBb,
             const primitiveMesh&,
-            const unallocLabelList&
+            const labelUList&
         );
 
         //- Construct from mesh and subset of cells, transferring contents
@@ -164,7 +164,7 @@ public:
             //  Returns actual point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const point& sample,
 
                 scalar& nearestDistSqr,
@@ -176,7 +176,7 @@ public:
             //  Returns point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const linePointRef& ln,
 
                 treeBoundBox& tightest,
@@ -188,7 +188,7 @@ public:
                 notImplemented
                 (
                     "treeDataCell::findNearest"
-                    "(const unallocLabelList&, const linePointRef&, ..)"
+                    "(const labelUList&, const linePointRef&, ..)"
                 );
             }
 
diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C
index 0a65f8ece8..6dde7b8a6b 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.C
+++ b/src/meshTools/indexedOctree/treeDataEdge.C
@@ -64,7 +64,7 @@ Foam::treeDataEdge::treeDataEdge
     const bool cacheBb,
     const edgeList& edges,
     const pointField& points,
-    const unallocLabelList& edgeLabels
+    const labelUList& edgeLabels
 )
 :
     edges_(edges),
@@ -143,7 +143,7 @@ bool Foam::treeDataEdge::overlaps
 // nearestPoint.
 void Foam::treeDataEdge::findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const point& sample,
 
     scalar& nearestDistSqr,
@@ -175,7 +175,7 @@ void Foam::treeDataEdge::findNearest
 //  Returns point and distance (squared)
 void Foam::treeDataEdge::findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const linePointRef& ln,
 
     treeBoundBox& tightest,
diff --git a/src/meshTools/indexedOctree/treeDataEdge.H b/src/meshTools/indexedOctree/treeDataEdge.H
index 8b7e54879f..8a02a8df9e 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.H
+++ b/src/meshTools/indexedOctree/treeDataEdge.H
@@ -98,7 +98,7 @@ public:
             const bool cacheBb,
             const edgeList& edges,
             const pointField& points,
-            const unallocLabelList& edgeLabels
+            const labelUList& edgeLabels
         );
 
         //- Construct from selected edges, transferring contents.
@@ -152,7 +152,7 @@ public:
             //  Returns actual point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const point& sample,
 
                 scalar& nearestDistSqr,
@@ -164,7 +164,7 @@ public:
             //  Returns point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const linePointRef& ln,
 
                 treeBoundBox& tightest,
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index f8273bec03..7114781de7 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -80,7 +80,7 @@ Foam::treeDataFace::treeDataFace
 (
     const bool cacheBb,
     const primitiveMesh& mesh,
-    const unallocLabelList& faceLabels
+    const labelUList& faceLabels
 )
 :
     mesh_(mesh),
@@ -482,7 +482,7 @@ bool Foam::treeDataFace::overlaps
 // nearestPoint.
 void Foam::treeDataFace::findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const point& sample,
 
     scalar& nearestDistSqr,
diff --git a/src/meshTools/indexedOctree/treeDataFace.H b/src/meshTools/indexedOctree/treeDataFace.H
index 6dbb881dbb..1e6e53690c 100644
--- a/src/meshTools/indexedOctree/treeDataFace.H
+++ b/src/meshTools/indexedOctree/treeDataFace.H
@@ -101,7 +101,7 @@ public:
         (
             const bool cacheBb,
             const primitiveMesh&,
-            const unallocLabelList&
+            const labelUList&
         );
 
         //- Construct from mesh and subset of faces, transferring contents
@@ -164,7 +164,7 @@ public:
             //  Returns actual point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const point& sample,
 
                 scalar& nearestDistSqr,
@@ -176,7 +176,7 @@ public:
             //  Returns point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const linePointRef& ln,
 
                 treeBoundBox& tightest,
@@ -188,7 +188,7 @@ public:
                 notImplemented
                 (
                     "treeDataFace::findNearest"
-                    "(const unallocLabelList&, const linePointRef&, ..)"
+                    "(const labelUList&, const linePointRef&, ..)"
                 );
             }
 
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index ffdbfdd4e0..0c3e628c6f 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -77,7 +77,7 @@ bool Foam::treeDataPoint::overlaps
 // nearestPoint.
 void Foam::treeDataPoint::findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const point& sample,
 
     scalar& nearestDistSqr,
@@ -107,7 +107,7 @@ void Foam::treeDataPoint::findNearest
 //  Returns point and distance (squared)
 void Foam::treeDataPoint::findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const linePointRef& ln,
 
     treeBoundBox& tightest,
diff --git a/src/meshTools/indexedOctree/treeDataPoint.H b/src/meshTools/indexedOctree/treeDataPoint.H
index 236f8139b8..58cabd3fd3 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.H
+++ b/src/meshTools/indexedOctree/treeDataPoint.H
@@ -107,7 +107,7 @@ public:
             //  Returns actual point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const point& sample,
 
                 scalar& nearestDistSqr,
@@ -119,7 +119,7 @@ public:
             //  Returns point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const linePointRef& ln,
 
                 treeBoundBox& tightest,
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 8fc75b77c5..1267b1342f 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -477,7 +477,7 @@ void
 Foam::treeDataPrimitivePatch<Face, FaceList, PointField, PointType>::
 findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const point& sample,
 
     scalar& nearestDistSqr,
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
index 7c3757504b..ca40e7118f 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
@@ -151,7 +151,7 @@ public:
             //  Returns actual point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const point& sample,
 
                 scalar& nearestDistSqr,
@@ -163,7 +163,7 @@ public:
             //  Returns point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const linePointRef& ln,
 
                 treeBoundBox& tightest,
@@ -175,7 +175,7 @@ public:
                 notImplemented
                 (
                     "treeDataPrimitivePatch::findNearest"
-                    "(const unallocLabelList&, const linePointRef&, ..)"
+                    "(const labelUList&, const linePointRef&, ..)"
                 );
             }
 
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.C b/src/meshTools/indexedOctree/treeDataTriSurface.C
index f380167174..81cad2948b 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.C
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.C
@@ -311,7 +311,7 @@ bool Foam::treeDataTriSurface::overlaps
 // nearestPoint.
 void Foam::treeDataTriSurface::findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const point& sample,
 
     scalar& nearestDistSqr,
@@ -398,7 +398,7 @@ void Foam::treeDataTriSurface::findNearest
 // nearestPoint.
 void Foam::treeDataTriSurface::findNearest
 (
-    const unallocLabelList& indices,
+    const labelUList& indices,
     const linePointRef& ln,
 
     treeBoundBox& tightest,
@@ -409,7 +409,7 @@ void Foam::treeDataTriSurface::findNearest
 {
     notImplemented
     (
-        "treeDataTriSurface::findNearest(const unallocLabelList&"
+        "treeDataTriSurface::findNearest(const labelUList&"
         ", const linePointRef&, treeBoundBox&, label&, point&, point&) const"
     );
 }
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.H b/src/meshTools/indexedOctree/treeDataTriSurface.H
index dc959f78ff..979e3a7801 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.H
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.H
@@ -127,7 +127,7 @@ public:
             //  Returns actual point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const point& sample,
 
                 scalar& nearestDistSqr,
@@ -139,7 +139,7 @@ public:
             //  Returns point and distance (squared)
             void findNearest
             (
-                const unallocLabelList& indices,
+                const labelUList& indices,
                 const linePointRef& ln,
 
                 treeBoundBox& tightest,
diff --git a/src/meshTools/octree/treeBoundBox.C b/src/meshTools/octree/treeBoundBox.C
index e4f4c14543..eab4694b3b 100644
--- a/src/meshTools/octree/treeBoundBox.C
+++ b/src/meshTools/octree/treeBoundBox.C
@@ -155,7 +155,7 @@ Foam::treeBoundBox::treeBoundBox(const UList<point>& points)
 Foam::treeBoundBox::treeBoundBox
 (
     const UList<point>& points,
-    const UList<label>& meshPoints
+    const labelUList& meshPoints
 )
 :
     boundBox()
@@ -165,7 +165,7 @@ Foam::treeBoundBox::treeBoundBox
         WarningIn
         (
             "treeBoundBox::treeBoundBox"
-            "(const UList<point>&, const UList<label>&)"
+            "(const UList<point>&, const labelUList&)"
         )   << "cannot find bounding box for zero-sized pointField"
             << "returning zero" << endl;
 
diff --git a/src/meshTools/octree/treeBoundBox.H b/src/meshTools/octree/treeBoundBox.H
index fff3411592..f462c719ae 100644
--- a/src/meshTools/octree/treeBoundBox.H
+++ b/src/meshTools/octree/treeBoundBox.H
@@ -177,7 +177,7 @@ public:
 
         //- Construct as subset of points
         //  Local processor domain only (no reduce as in boundBox)
-        treeBoundBox(const UList<point>&, const UList<label>& meshPoints);
+        treeBoundBox(const UList<point>&, const labelUList& meshPoints);
 
         //- Construct from Istream
         treeBoundBox(Istream&);
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index d405e779cc..4b375640cd 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -238,8 +238,8 @@ Foam::label Foam::decompositionMethod::masterFace
 //                pbm[patchI]
 //            );
 //
-//            const unallocLabelList& faceCells = cycPatch.faceCells();
-//            const unallocLabelList& nbrCells =
+//            const labelUList& faceCells = cycPatch.faceCells();
+//            const labelUList& nbrCells =
 //                cycPatch.neighbPatch().faceCells();
 //
 //            forAll(faceCells, facei)
@@ -308,8 +308,8 @@ Foam::label Foam::decompositionMethod::masterFace
 //                pbm[patchI]
 //            );
 //
-//            const unallocLabelList& faceCells = cycPatch.faceCells();
-//            const unallocLabelList& nbrCells =
+//            const labelUList& faceCells = cycPatch.faceCells();
+//            const labelUList& nbrCells =
 //                cycPatch.neighbPatch().faceCells();
 //
 //            forAll(faceCells, facei)
diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
index 04338dc46b..0e837a88f8 100644
--- a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
@@ -95,7 +95,7 @@ Foam::labelList Foam::structuredDecomp::decompose
     labelHashSet patchCells(2*nFaces);
     forAll(patchIDs, i)
     {
-        const unallocLabelList& fc = pbm[patchIDs[i]].faceCells();
+        const labelUList& fc = pbm[patchIDs[i]].faceCells();
         forAll(fc, i)
         {
             patchCells.insert(fc[i]);
@@ -131,7 +131,7 @@ Foam::labelList Foam::structuredDecomp::decompose
     forAll(patchIDs, i)
     {
         const polyPatch& pp = pbm[patchIDs[i]];
-        const unallocLabelList& fc = pp.faceCells();
+        const labelUList& fc = pp.faceCells();
         forAll(fc, i)
         {
             patchFaces[nFaces] = pp.start()+i;
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
index 81d40b634d..c2df14ba47 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
@@ -115,7 +115,7 @@ public:
                     return true;
                 }
 
-                const unallocLabelList& directAddressing() const
+                const labelUList& directAddressing() const
                 {
                     return unallocLabelList::null();
                 }
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
index faafb1d291..dbb6728c9c 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
@@ -112,7 +112,7 @@ public:
                     return true;
                 }
 
-                const unallocLabelList& directAddressing() const
+                const labelUList& directAddressing() const
                 {
                     return unallocLabelList::null();
                 }
diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C
index 35e98239aa..f2ed510a55 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.C
+++ b/src/sampling/cuttingPlane/cuttingPlane.C
@@ -44,7 +44,7 @@ void Foam::cuttingPlane::calcCutCells
 (
     const primitiveMesh& mesh,
     const scalarField& dotProducts,
-    const UList<label>& cellIdLabels
+    const labelUList& cellIdLabels
 )
 {
     const labelListList& cellEdges = mesh.cellEdges();
@@ -165,7 +165,7 @@ void Foam::cuttingPlane::intersectEdges
 bool Foam::cuttingPlane::walkCell
 (
     const primitiveMesh& mesh,
-    const UList<label>& edgePoint,
+    const labelUList& edgePoint,
     const label cellI,
     const label startEdgeI,
     DynamicList<label>& faceVerts
@@ -258,7 +258,7 @@ void Foam::cuttingPlane::walkCellCuts
 (
     const primitiveMesh& mesh,
     const bool triangulate,
-    const UList<label>& edgePoint
+    const labelUList& edgePoint
 )
 {
     const pointField& cutPoints = this->points();
@@ -355,7 +355,7 @@ Foam::cuttingPlane::cuttingPlane
     const plane& pln,
     const primitiveMesh& mesh,
     const bool triangulate,
-    const UList<label>& cellIdLabels
+    const labelUList& cellIdLabels
 )
 :
     plane(pln)
@@ -372,7 +372,7 @@ void Foam::cuttingPlane::reCut
 (
     const primitiveMesh& mesh,
     const bool triangulate,
-    const UList<label>& cellIdLabels
+    const labelUList& cellIdLabels
 )
 {
     MeshStorage::clear();
@@ -396,7 +396,7 @@ void Foam::cuttingPlane::reCut
 // remap action on triangulation
 void Foam::cuttingPlane::remapFaces
 (
-    const UList<label>& faceMap
+    const labelUList& faceMap
 )
 {
     // recalculate the cells cut
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H
index 22ef553bd9..27651362f7 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.H
+++ b/src/sampling/cuttingPlane/cuttingPlane.H
@@ -78,7 +78,7 @@ class cuttingPlane
         (
             const primitiveMesh&,
             const scalarField& dotProducts,
-            const UList<label>& cellIdLabels = UList<label>::null()
+            const labelUList& cellIdLabels = labelUList::null()
         );
 
         //- Determine intersection points (cutPoints).
@@ -94,7 +94,7 @@ class cuttingPlane
         static bool walkCell
         (
             const primitiveMesh&,
-            const UList<label>& edgePoint,
+            const labelUList& edgePoint,
             const label cellI,
             const label startEdgeI,
             DynamicList<label>& faceVerts
@@ -105,7 +105,7 @@ class cuttingPlane
         (
             const primitiveMesh& mesh,
             const bool triangulate,
-            const UList<label>& edgePoint
+            const labelUList& edgePoint
         );
 
 
@@ -123,11 +123,11 @@ protected:
         (
             const primitiveMesh&,
             const bool triangulate,
-            const UList<label>& cellIdLabels = UList<label>::null()
+            const labelUList& cellIdLabels = labelUList::null()
         );
 
         //- remap action on triangulation or cleanup
-        virtual void remapFaces(const UList<label>& faceMap);
+        virtual void remapFaces(const labelUList& faceMap);
 
 public:
 
@@ -140,7 +140,7 @@ public:
             const plane&,
             const primitiveMesh&,
             const bool triangulate,
-            const UList<label>& cellIdLabels = UList<label>::null()
+            const labelUList& cellIdLabels = labelUList::null()
         );
 
 
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 0248c41d30..423efb0fdf 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -74,7 +74,7 @@ void Foam::meshToMesh::calcAddressing()
     forAll(patchesFrom, patchI)
     {
         // get reference to cells next to the boundary
-        const unallocLabelList& bCells = patchesFrom[patchI].faceCells();
+        const labelUList& bCells = patchesFrom[patchI].faceCells();
 
         forAll(bCells, faceI)
         {
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index 6f33f00f11..5adbcdb5cf 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -102,7 +102,7 @@ Foam::isoSurface::adaptPatchFields
 
             // Note: cannot use patchInternalField since uses emptyFvPatch::size
             // Do our own internalField instead.
-            const unallocLabelList& faceCells =
+            const labelUList& faceCells =
                 mesh.boundary()[patchI].patch().faceCells();
 
             Field<Type>& pfld = sliceFld.boundaryField()[patchI];
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.C b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
index 4dfd6351f1..9ed86afef8 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
@@ -150,7 +150,7 @@ bool Foam::sampledPatch::update()
 // remap action on triangulation
 void Foam::sampledPatch::remapFaces
 (
-    const UList<label>& faceMap
+    const labelUList& faceMap
 )
 {
     // recalculate the cells cut
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
index 8466197ca8..2fdfe38c6a 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
@@ -86,7 +86,7 @@ class sampledPatch
 
 
         //- remap action on triangulation or cleanup
-        virtual void remapFaces(const UList<label>& faceMap);
+        virtual void remapFaces(const labelUList& faceMap);
 
 public:
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 91f5040936..f3c4c5bde8 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -187,7 +187,7 @@ Foam::MeshedSurface<Face>::MeshedSurface
 (
     const Xfer<pointField>& pointLst,
     const Xfer<List<Face> >& faceLst,
-    const UList<label>& zoneSizes,
+    const labelUList& zoneSizes,
     const UList<word>& zoneNames
 )
 :
@@ -430,7 +430,7 @@ Foam::MeshedSurface<Face>::~MeshedSurface()
 template<class Face>
 void Foam::MeshedSurface<Face>::remapFaces
 (
-    const UList<label>& faceMap
+    const labelUList& faceMap
 )
 {
     // recalculate the zone start/size
@@ -920,7 +920,7 @@ Foam::label Foam::MeshedSurface<Face>::triangulate
             {
                 newFaces[newFaceI] = Face
                 (
-                    static_cast<UList<label>&>(tmpTri[triI])
+                    static_cast<labelUList&>(tmpTri[triI])
                 );
                 faceMap[newFaceI] = faceI;
                 newFaceI++;
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index eb4021d3bc..b47e2c98d7 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -151,7 +151,7 @@ protected:
         );
 
         //- Set new zones from faceMap
-        virtual void remapFaces(const UList<label>& faceMap);
+        virtual void remapFaces(const labelUList& faceMap);
 
 
 public:
@@ -197,7 +197,7 @@ public:
         (
             const Xfer<pointField>&,
             const Xfer<List<Face> >&,
-            const UList<label>& zoneSizes = UList<label>(),
+            const labelUList& zoneSizes = labelUList(),
             const UList<word>& zoneNames = UList<word>()
         );
 
@@ -317,7 +317,7 @@ public:
             //- Add surface zones
             virtual void addZones
             (
-                const UList<label>& sizes,
+                const labelUList& sizes,
                 const UList<word>& names,
                 const bool cullEmpty=false
             );
@@ -325,7 +325,7 @@ public:
             //- Add surface zones
             virtual void addZones
             (
-                const UList<label>& sizes,
+                const labelUList& sizes,
                 const bool cullEmpty=false
             );
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
index 17362de3a7..9efc4ba7fd 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
@@ -46,7 +46,7 @@ namespace Foam
         {
             newFaces[faceI] = triFace
             (
-                static_cast<const UList<label>&>(origFaces[faceI])
+                static_cast<const labelUList&>(origFaces[faceI])
             );
         }
         surf.clear();
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index b684630302..a61ca0f1b7 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -132,7 +132,7 @@ void Foam::MeshedSurface<Face>::addZones
 template<class Face>
 void Foam::MeshedSurface<Face>::addZones
 (
-    const UList<label>& sizes,
+    const labelUList& sizes,
     const UList<word>& names,
     const bool cullEmpty
 )
@@ -164,7 +164,7 @@ void Foam::MeshedSurface<Face>::addZones
 template<class Face>
 void Foam::MeshedSurface<Face>::addZones
 (
-    const UList<label>& sizes,
+    const labelUList& sizes,
     const bool cullEmpty
 )
 {
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index a80c45bfdd..660365b28b 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -175,7 +175,7 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
     const Xfer<pointField>& pointLst,
     const Xfer<List<Face> >& faceLst,
-    const UList<label>& zoneSizes,
+    const labelUList& zoneSizes,
     const UList<word>& zoneNames
 )
 :
@@ -346,7 +346,7 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
 template<class Face>
 void Foam::UnsortedMeshedSurface<Face>::setZones
 (
-    const UList<label>& sizes,
+    const labelUList& sizes,
     const UList<word>& names
 )
 {
@@ -370,7 +370,7 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
 template<class Face>
 void Foam::UnsortedMeshedSurface<Face>::setZones
 (
-    const UList<label>& sizes
+    const labelUList& sizes
 )
 {
     zoneIds_.setSize(size());
@@ -397,7 +397,7 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
 template<class Face>
 void Foam::UnsortedMeshedSurface<Face>::remapFaces
 (
-    const UList<label>& faceMap
+    const labelUList& faceMap
 )
 {
     // re-assign the zone Ids
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 71db518320..61359a9381 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -127,7 +127,7 @@ protected:
         }
 
         //- Set new zones from faceMap
-        virtual void remapFaces(const UList<label>& faceMap);
+        virtual void remapFaces(const labelUList& faceMap);
 
 
 public:
@@ -172,7 +172,7 @@ public:
         (
             const Xfer<pointField>&,
             const Xfer<List<Face> >&,
-            const UList<label>& zoneSizes = UList<label>(),
+            const labelUList& zoneSizes = labelUList(),
             const UList<word>& zoneNames = UList<word>()
         );
 
@@ -284,10 +284,10 @@ public:
             void setZones(const surfZoneList&);
 
             //- Set zone ids and zones
-            void setZones(const UList<label>& sizes, const UList<word>& names);
+            void setZones(const labelUList& sizes, const UList<word>& names);
 
             //- Set zone ids and zones with default names
-            void setZones(const UList<label>& sizes);
+            void setZones(const labelUList& sizes);
 
 
         // Edit
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 6593d5ba3e..70b5455eaa 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -213,7 +213,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
                         verts[vertI] = parse<int>(line) + vertexOffset;
                     }
 
-                    UList<label>& f = static_cast<UList<label>&>(verts);
+                    labelUList& f = static_cast<labelUList&>(verts);
 
                     if (mustTriangulate && f.size() > 3)
                     {
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 6718e49be5..0fa63e4225 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -228,7 +228,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
         else if (cmd == "CQUAD4")
         {
             face fQuad(4);
-            UList<label>& f = static_cast<UList<label>&>(fQuad);
+            labelUList& f = static_cast<labelUList&>(fQuad);
 
             label groupId = readLabel(IStringStream(line.substr(16,8))());
             fQuad[0] = readLabel(IStringStream(line.substr(24,8))());
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index d304c743f2..bc54486cc3 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -174,7 +174,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
             }
             dynVertices.shrink();
 
-            UList<label>& f = static_cast<UList<label>&>(dynVertices);
+            labelUList& f = static_cast<labelUList&>(dynVertices);
 
             if (mustTriangulate && f.size() > 3)
             {
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index e31f217772..5237910176 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -120,7 +120,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
                 lineStream >> verts[vertI];
             }
 
-            UList<label>& f = static_cast<UList<label>&>(verts);
+            labelUList& f = static_cast<labelUList&>(verts);
 
             if (mustTriangulate && f.size() > 3)
             {
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 4d66a8282c..a46884780b 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -217,7 +217,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
                     (
                         triFace
                         (
-                            static_cast<UList<label>&>(triFaces[faceI])
+                            static_cast<labelUList&>(triFaces[faceI])
                         )
                     );
                     dynZones.append(zoneI);
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
index daaf9f3578..c5fe7b2885 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
@@ -96,7 +96,7 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
 void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
 (
     Ostream& os,
-    const UList<label>& zoneIds
+    const labelUList& zoneIds
 )
 {
     // Print zone numbers
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
index 466b66f8f4..b5e6b6bfb4 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
@@ -67,7 +67,7 @@ protected:
         static void writeTail(Ostream&, const UList<surfZone>&);
 
         //- Write trailing information with zone Ids
-        static void writeTail(Ostream&, const UList<label>& zoneIds);
+        static void writeTail(Ostream&, const labelUList& zoneIds);
 };
 
 
diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
index aa9194942e..07036083a8 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
@@ -621,7 +621,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::Srho() const
 
         distMap.distribute(patchMass);
 
-        const unallocLabelList& cells = wpp.faceCells();
+        const labelUList& cells = wpp.faceCells();
 
         forAll(patchMass, j)
         {
@@ -681,7 +681,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::Srho(const label i) const
 
             distMap.distribute(patchMass);
 
-            const unallocLabelList& cells = wpp.faceCells();
+            const labelUList& cells = wpp.faceCells();
 
             forAll(patchMass, j)
             {
@@ -739,7 +739,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::Sh() const
             energyPhaseChangeForPrimary_.boundaryField()[filmPatchI];
         distMap.distribute(patchEnergy);
 
-        const unallocLabelList& cells = wpp.faceCells();
+        const labelUList& cells = wpp.faceCells();
 
         forAll(patchMass, j)
         {