diff --git a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit
new file mode 100644
index 000000000..aa634ec21
--- /dev/null
+++ b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit
@@ -0,0 +1,38 @@
+--- orig/ParMGridGen-1.0/mgridgen.h	2019-01-15 13:32:54.247812378 +0100
++++ ParMGridGen-1.0/mgridgen.h	2019-01-15 13:35:03.972952464 +0100
+@@ -1,4 +1,4 @@
+-typedef int idxtype;
++typedef long int idxtype;
+ typedef double realtype;
+ 
+ 
+--- orig/ParMGridGen-1.0/parmgridgen.h	2019-01-15 13:32:54.251812414 +0100
++++ ParMGridGen-1.0/parmgridgen.h	2019-01-15 13:42:14.344335223 +0100
+@@ -1,4 +1,4 @@
+-typedef int idxtype;
++typedef long int idxtype;
+ typedef double realtype;
+ 
+ void ParMGridGen(idxtype *, idxtype *, realtype *, realtype *, idxtype *,
+--- orig/ParMGridGen-1.0/ParMGridGen/IMParMetis-2.0/ParMETISLib/struct.h	2019-01-15 13:32:54.247812378 +0100
++++ ParMGridGen-1.0/ParMGridGen/IMParMetis-2.0/ParMETISLib/struct.h	2019-01-15 13:44:17.605231500 +0100
+@@ -15,7 +15,7 @@
+ 
+ /* Indexes are as long as integers for now */
+ #ifdef IDXTYPE_INT
+-typedef int idxtype;
++typedef long int idxtype;
+ #define IDX_DATATYPE	MPI_INT
+ #else
+ typedef short idxtype;
+--- orig/ParMGridGen-1.0/MGridGen/IMlib/IMlib.h	2019-01-15 13:32:54.251812414 +0100
++++ ParMGridGen-1.0/MGridGen/IMlib/IMlib.h	2019-01-15 13:52:11.504522970 +0100
+@@ -16,7 +16,7 @@
+ 
+ /* Indexes are as long as integers for now */
+ #ifdef IDXTYPE_INT
+-typedef int idxtype;
++typedef long int idxtype;
+ #else
+ typedef short idxtype;
+ #endif
diff --git a/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit b/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit
new file mode 100644
index 000000000..0d2684910
--- /dev/null
+++ b/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit
@@ -0,0 +1,11 @@
+--- orig/parmetis-4.0.3/metis/include/metis.h	2019-01-15 12:40:31.050842343 +0100
++++ parmetis-4.0.3/metis/include/metis.h	2019-01-15 12:43:01.883662756 +0100
+@@ -30,7 +30,7 @@
+  GCC does provides these definitions in stdint.h, but it may require some
+  modifications on other architectures.
+ --------------------------------------------------------------------------*/
+-#define IDXTYPEWIDTH 32
++#define IDXTYPEWIDTH 64
+ 
+ 
+ /*--------------------------------------------------------------------------
diff --git a/ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit b/ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit
new file mode 100644
index 000000000..dc702db1d
--- /dev/null
+++ b/ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit
@@ -0,0 +1,11 @@
+--- orig/metis-5.1.0/include/metis.h	2019-01-15 12:40:31.050842343 +0100
++++ metis-5.1.0/include/metis.h	2019-01-15 12:43:01.883662756 +0100
+@@ -30,7 +30,7 @@
+  GCC does provides these definitions in stdint.h, but it may require some
+  modifications on other architectures.
+ --------------------------------------------------------------------------*/
+-#define IDXTYPEWIDTH 32
++#define IDXTYPEWIDTH 64
+ 
+ 
+ /*--------------------------------------------------------------------------
diff --git a/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0 b/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0
index fba224042..84f4393bc 100644
--- a/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0
+++ b/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0
@@ -27,14 +27,15 @@ diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib sc
 diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib
 --- scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib	2014-08-05 08:56:17.000000000 -0400
 +++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib	2015-06-21 00:26:43.072992194 -0400
-@@ -8,10 +8,10 @@
+@@ -8,10 +8,11 @@
  CAT		= cat
  CCS		= gcc
  CCP		= mpicc
 -CCD		= gcc
 -CFLAGS		= -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict
 +CCD		= mpicc -I$(MPI_HOME)/include
-+CFLAGS		= -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed
++INTSIZE		=
++CFLAGS		= -O3 $(INTSIZE) -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed
  CLIBFLAGS	= -shared -fPIC
 -LDFLAGS		= -lz -lm -pthread
 +LDFLAGS		= -lz -lm -pthread -lrt
diff --git a/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit b/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit
new file mode 100644
index 000000000..fce35365a
--- /dev/null
+++ b/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit
@@ -0,0 +1,12 @@
+diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib
+--- orig/scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib	2019-01-15 11:26:39.142915259 +0100
++++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib	2019-01-15 11:26:58.871041175 +0100
+@@ -9,7 +9,7 @@
+ CCS		= gcc
+ CCP		= mpicc
+ CCD		= mpicc -I$(MPI_HOME)/include
+-INTSIZE		=
++INTSIZE		= -DINTSIZE64
+ CFLAGS		= -O3 $(INTSIZE) -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed
+ CLIBFLAGS	= -shared -fPIC
+ LDFLAGS		= -lz -lm -pthread -lrt
diff --git a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec
index 540f37ab3..d52fc4073 100644
--- a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec
@@ -78,6 +78,7 @@ Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:                 ParMGridGen-1.0.patch_darwin
 Patch1:                 ParMGridGen-1.0.patch
+Patch2:                 ParMGridGen-1.0.patch_64Bit
 
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 
@@ -93,6 +94,10 @@ Patch1:                 ParMGridGen-1.0.patch
 %patch1 -p1
 %endif
 
+if [ "$WM_LABEL_SIZE" = "64" ]; then
+%patch2 -p1
+fi
+
 %build
     [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
     [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
diff --git a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec
index 5450c3e68..f115d27ba 100644
--- a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec
@@ -77,6 +77,7 @@ Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:         metis-5.1.0_patch_gcc
+Patch1:         metis-5.1.0_patch_64Bit
 
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 
@@ -90,6 +91,10 @@ Patch0:         metis-5.1.0_patch_gcc
 %patch0 -p1
 %endif
 
+if [ "$WM_LABEL_SIZE" = "64" ]; then
+%patch1 -p1
+fi
+
 %build
     [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
     [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
diff --git a/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec b/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec
index 1f0dea975..00b49a908 100644
--- a/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec
+++ b/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec
@@ -78,6 +78,7 @@ Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:         ParMetis-3.1.1.patch_darwin
 Patch1:         ParMetis-3.1.1.patch
+Patch2:         ParMetis-3.1.1.patch_64Bit
 
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 
@@ -93,6 +94,10 @@ Patch1:         ParMetis-3.1.1.patch
 #patch1 -p1
 %endif
 
+if [ "$WM_LABEL_SIZE" = "64" ]; then
+%patch2 -p1
+fi
+
 %build
     [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
     [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
diff --git a/ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec b/ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec
index 19a9c3058..baa3f77e0 100644
--- a/ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec
+++ b/ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec
@@ -77,6 +77,7 @@ Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:         scotch-6.0.4_patch_0
 Patch1:         scotch-6.0.4_patch_darwin
+Patch2:         scotch-6.0.4_patch_64Bit
 
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 
@@ -92,6 +93,10 @@ Patch1:         scotch-6.0.4_patch_darwin
 %patch0 -p1
 %endif
 
+if [ "$WM_LABEL_SIZE" = "64" ]; then
+%patch2 -p1
+fi
+
 %build
     # export WM settings in a form that GNU configure recognizes
    # [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index c2aebcf0d..060b5ac97 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -8,7 +8,7 @@
     PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
     PtrList<volScalarField> DpDtFluid(fluidRegions.size());
 
-    List<scalar> initialMassFluid(fluidRegions.size());
+    scalarList initialMassFluid(fluidRegions.size());
 
     // Populate fluid field pointer lists
     forAll(fluidRegions, i)
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
index ee955e82d..0d956eb7a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
@@ -54,10 +54,10 @@ class regionProperties
     // Private data
 
         //- List of the fluid region names
-        List<word> fluidRegionNames_;
+        wordList fluidRegionNames_;
 
         //- List of the solid region names
-        List<word> solidRegionNames_;
+        wordList solidRegionNames_;
 
 
     // Private Member Functions
@@ -87,10 +87,10 @@ public:
         // Access
 
             //- Return const reference to the list of fluid region names
-            const List<word>& fluidRegionNames() const;
+            const wordList& fluidRegionNames() const;
 
             //- Return const reference to the list of solid region names
-            const List<word>& solidRegionNames() const;
+            const wordList& solidRegionNames() const;
 };
 
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
index 4365345c7..581420428 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
@@ -8,9 +8,9 @@
     PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
     PtrList<volScalarField> DpDtf(fluidRegions.size());
 
-    List<scalar> initialMassFluid(fluidRegions.size());
-    List<label> pRefCellFluid(fluidRegions.size(),0);
-    List<scalar> pRefValueFluid(fluidRegions.size(),0.0);
+    scalarList initialMassFluid(fluidRegions.size());
+    labelList pRefCellFluid(fluidRegions.size(),0);
+    scalarList pRefValueFluid(fluidRegions.size(),0.0);
 
 
     // Populate fluid field pointer lists
diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H
index e762c0573..e30261b86 100644
--- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H
+++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H
@@ -60,7 +60,7 @@ nCoupledFacesToBreak = 0;
     }
 
     labelList facesToBreak(facesToBreakList);
-    List<scalar> facesToBreakEffTractionFraction
+    scalarList facesToBreakEffTractionFraction
     (
         facesToBreakEffTractionFractionList
     );
@@ -192,7 +192,7 @@ nCoupledFacesToBreak = 0;
     }
 
     labelList coupledFacesToBreak(coupledFacesToBreakList);
-    List<scalar> coupledFacesToBreakEffTractionFraction
+    scalarList coupledFacesToBreakEffTractionFraction
     (
         coupledFacesToBreakEffTractionFractionList
     );
diff --git a/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H b/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H
index c4d431c66..e79e2381d 100644
--- a/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H
+++ b/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H
@@ -62,7 +62,7 @@ nCoupledFacesToBreak = 0;
     }
 
     labelList facesToBreak(facesToBreakList);
-    List<scalar> facesToBreakEffTractionFraction
+    scalarList facesToBreakEffTractionFraction
     (
         facesToBreakEffTractionFractionList
     );
@@ -197,7 +197,7 @@ nCoupledFacesToBreak = 0;
     }
 
     labelList coupledFacesToBreak(coupledFacesToBreakList);
-    List<scalar> coupledFacesToBreakEffTractionFraction
+    scalarList coupledFacesToBreakEffTractionFraction
     (
         coupledFacesToBreakEffTractionFractionList
     );
diff --git a/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/updateCrack.H b/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/updateCrack.H
index c17ac162a..dea37e633 100644
--- a/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/updateCrack.H
+++ b/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/updateCrack.H
@@ -60,7 +60,7 @@ nCoupledFacesToBreak = 0;
     }
 
     labelList facesToBreak(facesToBreakList);
-    List<scalar> facesToBreakEffTractionFraction
+    scalarList facesToBreakEffTractionFraction
     (
         facesToBreakEffTractionFractionList
     );
@@ -192,7 +192,7 @@ nCoupledFacesToBreak = 0;
     }
 
     labelList coupledFacesToBreak(coupledFacesToBreakList);
-    List<scalar> coupledFacesToBreakEffTractionFraction
+    scalarList coupledFacesToBreakEffTractionFraction
     (
         coupledFacesToBreakEffTractionFractionList
     );
diff --git a/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C b/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
index b536a7162..5fcafb449 100644
--- a/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
+++ b/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
     {
         label curMeshEdge = meshEdges[edgeI];
 
-        labelList curEdgePatchIDs(2, -1);
+        labelList curEdgePatchIDs(2, label(-1));
 
         label patchI = -1;
 
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index d78f76cf4..861498a1f 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
 
     // Mark cut edges.
 
-    DynamicList<label> allCutEdges(pp.nEdges());
+    dynamicLabelList allCutEdges(pp.nEdges());
 
     DynamicList<scalar> allCutEdgeWeights(pp.nEdges());
 
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 4ad92080e..69432b1f9 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -117,14 +117,14 @@ int main(int argc, char *argv[])
     SortableList<scalar> sortedVols(vols);
 
     // All cell labels, sorted per bin.
-    DynamicList<DynamicList<label> > bins;
+    DynamicList<dynamicLabelList > bins;
 
     // Lower/upper limits
     DynamicList<scalar> lowerLimits;
     DynamicList<scalar> upperLimits;
 
     // Create bin0. Have upperlimit as factor times lowerlimit.
-    bins.append(DynamicList<label>());
+    bins.append(dynamicLabelList());
     lowerLimits.append(sortedVols[0]);
     upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]);
 
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
             // New value outside of current bin
 
             // Shrink old bin.
-            DynamicList<label>& bin = bins[bins.size()-1];
+            dynamicLabelList& bin = bins[bins.size()-1];
 
             bin.shrink();
 
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
                 << upperLimits[upperLimits.size()-1] << endl;
 
             // Create new bin.
-            bins.append(DynamicList<label>());
+            bins.append(dynamicLabelList());
             lowerLimits.append(sortedVols[i]);
             upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]);
 
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
         }
 
         // Append to current bin.
-        DynamicList<label>& bin = bins[bins.size()-1];
+        dynamicLabelList& bin = bins[bins.size()-1];
 
         bin.append(sortedVols.indices()[i]);
     }
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
     Info<< "Volume bins:" << nl;
     forAll(bins, binI)
     {
-        const DynamicList<label>& bin = bins[binI];
+        const dynamicLabelList& bin = bins[binI];
 
         cellSet cells(mesh, "vol" + name(binI), bin.size());
 
@@ -280,7 +280,7 @@ int main(int argc, char *argv[])
     // Set cell values
     forAll(bins, binI)
     {
-        const DynamicList<label>& bin = bins[binI];
+        const dynamicLabelList& bin = bins[binI];
 
         forAll(bin, i)
         {
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C
index cabf7df23..ca1865328 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCells.C
+++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C
@@ -256,7 +256,7 @@ label selectOutsideCells
 
     // Outside faces
     labelHashSet outsideFacesMap(outsidePts.size() * 6 * 2);
-    DynamicList<label> outsideFaces(outsideFacesMap.size());
+    dynamicLabelList outsideFaces(outsideFacesMap.size());
     // CellInfo on outside faces
     DynamicList<cellInfo> outsideFacesInfo(outsideFacesMap.size());
 
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 70bfcc0a3..2b3a6ab73 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -190,7 +190,7 @@ bool splitHex
     const label cellI,
     const label edgeI,
 
-    DynamicList<label>& cutCells,
+    dynamicLabelList& cutCells,
     DynamicList<labelList>& cellLoops,
     DynamicList<scalarField>& cellEdgeWeights
 )
@@ -306,7 +306,7 @@ bool splitCell
     const boolList& edgeIsCut,
     const scalarField& edgeWeight,
 
-    DynamicList<label>& cutCells,
+    dynamicLabelList& cutCells,
     DynamicList<labelList>& cellLoops,
     DynamicList<scalarField>& cellEdgeWeights
 )
@@ -369,7 +369,7 @@ void collectCuts
     const scalar minSin,
     const cellSet& cellsToCut,
 
-    DynamicList<label>& cutCells,
+    dynamicLabelList& cutCells,
     DynamicList<labelList>& cellLoops,
     DynamicList<scalarField>& cellEdgeWeights
 )
@@ -600,7 +600,7 @@ int main(int argc, char *argv[])
 
 
         // Cut information per cut cell
-        DynamicList<label> cutCells(mesh.nCells()/10 + 10);
+        dynamicLabelList cutCells(mesh.nCells()/10 + 10);
         DynamicList<labelList> cellLoops(mesh.nCells()/10 + 10);
         DynamicList<scalarField> cellEdgeWeights(mesh.nCells()/10 + 10);
 
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 1f5b4e225..c5bb502db 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -131,7 +131,7 @@ void storeCellInZone
     const label cellI,
     const label cellType,
     Map<label>& typeToZone,
-    List<DynamicList<label> >& zoneCells
+    List<dynamicLabelList >& zoneCells
 )
 {
     if (cellType >= 0)
@@ -389,8 +389,8 @@ void ReadCells
     labelList& foamCellMap,
     labelList& foamCellType,
     Map<label>& prostarToFoamPatch,
-    DynamicList<label>& foamPatchSizes,
-    DynamicList<label>& foamPatchStarts,
+    dynamicLabelList& foamPatchSizes,
+    dynamicLabelList& foamPatchStarts,
     labelList& foamFaceMap,
     labelList& foamOwner,
     labelList& foamNeighbour,
@@ -599,8 +599,8 @@ int main(int argc, char *argv[])
 
     // Patching info
     Map<label> prostarToFoamPatch;
-    DynamicList<label> foamPatchSizes;
-    DynamicList<label> foamPatchStarts;
+    dynamicLabelList foamPatchSizes;
+    dynamicLabelList foamPatchStarts;
     // Face connectivity
     labelList foamFaceMap;
     labelList foamOwner;
@@ -1008,7 +1008,7 @@ int main(int argc, char *argv[])
         // From foamCellType physical region to Foam cellZone
         Map<label> typeToZone;
         // Storage for cell zones.
-        List<DynamicList<label> > zoneCells(0);
+        List<dynamicLabelList > zoneCells(0);
 
         forAll(foamCellType, cellI)
         {
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
index 70ed628a2..919b9a865 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
@@ -28,6 +28,7 @@ Description
 
 #include "cellShapeRecognition.H"
 #include "labelList.H"
+#include "boolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -143,7 +144,7 @@ cellShape create3DCellShape
     labelList pointLabels(curModel.nPoints(), -1);
 
     // Follow the used mesh faces
-    List<bool> meshFaceUsed(localFaces.size(), false);
+    boolList meshFaceUsed(localFaces.size(), false);
 
     // Get the raw model faces
     const faceList& modelFaces = curModel.modelFaces();
diff --git a/applications/utilities/mesh/conversion/foamMeshToAbaqus/foamMeshToAbaqus.C b/applications/utilities/mesh/conversion/foamMeshToAbaqus/foamMeshToAbaqus.C
index b16249f29..0dd42fa38 100644
--- a/applications/utilities/mesh/conversion/foamMeshToAbaqus/foamMeshToAbaqus.C
+++ b/applications/utilities/mesh/conversion/foamMeshToAbaqus/foamMeshToAbaqus.C
@@ -99,7 +99,11 @@ int main(int argc, char *argv[])
     const labelList faceOwner = mesh.faceOwner();
     const vectorField faceNormals = mesh.Sf()/mesh.magSf();
 
-    labelListList abaqusCellPoints(cellPoints.size(), List<label>(8, 1));
+    labelListList abaqusCellPoints
+    (
+        cellPoints.size(),
+        labelList(8, label(1))
+    );
 
     forAll(cells, celli)
     {
@@ -338,7 +342,11 @@ int main(int argc, char *argv[])
             }
         }
 
-        labelListList materialsOrdered(numberOfMaterials, List<label>(0,0));
+        labelListList materialsOrdered
+        (
+            numberOfMaterials,
+            labelList(0, label(0))
+        );
         forAll(materialsOrdered, matOrderi)
         {
              materialsOrdered[matOrderi].setSize(cellsOfEachMaterial[matOrderi], 0);
@@ -401,7 +409,7 @@ int main(int argc, char *argv[])
         //- face 5 is nodes 3 7 8 4
         //- face 6 is nodes 4 8 5 1
         //- So i will compare points on the face and
-        labelListList abaqusFaceConvention(6, List<label>(4,-1));
+        labelListList abaqusFaceConvention(6, labelList(4, label(-1)));
         abaqusFaceConvention[0][0] = 1;
         abaqusFaceConvention[0][1] = 2;
         abaqusFaceConvention[0][2] = 3;
@@ -438,7 +446,7 @@ int main(int argc, char *argv[])
             //- face it is
             const labelList& facePoints = mesh.boundaryMesh()[patchi][facei];
             const labelList& thisCellAbaqusPoints = abaqusCellPoints[globalCelli];
-            labelList thisFaceAbaqusPoints(4,-1);
+            labelList thisFaceAbaqusPoints(4, label(-1));
             label pointsFound = 0;
             forAll(thisCellAbaqusPoints, pointi)
             {
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 94c0e8030..1ec0a8fbb 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -206,7 +206,7 @@ void storeCellInZone
     Map<label>& physToZone,
 
     labelList& zoneToPhys,
-    List<DynamicList<label> >& zoneCells
+    List<dynamicLabelList >& zoneCells
 )
 {
     Map<label>::const_iterator zoneFnd = physToZone.find(regPhys);
@@ -373,7 +373,7 @@ void readCells
     List<DynamicList<face> >& patchFaces,
 
     labelList& zoneToPhys,
-    List<DynamicList<label> >& zoneCells
+    List<dynamicLabelList >& zoneCells
 )
 {
     Info<< "Starting to read cells at line " << inFile.lineNumber() << endl;
@@ -786,7 +786,7 @@ int main(int argc, char *argv[])
     // Map from cellZone to gmsh physical region
     labelList zoneToPhys;
     // Storage for cell zones.
-    List<DynamicList<label> > zoneCells(0);
+    List<dynamicLabelList > zoneCells(0);
 
     // Name per physical region
     Map<word> physicalNames;
@@ -933,7 +933,7 @@ int main(int argc, char *argv[])
     const polyPatch& pp = mesh.boundaryMesh()[mesh.boundaryMesh().size()-1];
 
     // Storage for faceZones.
-    List<DynamicList<label> > zoneFaces(patchFaces.size());
+    List<dynamicLabelList > zoneFaces(patchFaces.size());
 
 
     // Go through all the patchFaces and find corresponding face in pp.
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index f7c666183..8c6dbfb5d 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -185,7 +185,7 @@ void readPoints
 (
     IFstream& is,
     DynamicList<point>& points,     // coordinates
-    DynamicList<label>& unvPointID  // unv index
+    dynamicLabelList& unvPointID  // unv index
 )
 {
     Sout<< "Starting reading points at line " << is.lineNumber() << '.' << endl;
@@ -210,7 +210,7 @@ void readPoints
             IOWarningIn
             (
                 "readPoints(IFstream&, label&, DynamicList<point>"
-                ", DynamicList<label>&)",
+                ", dynamicLabelList&)",
                 is
             )   << "Points not in order starting at point " << pointI
                 //<< " at line " << is.lineNumber()
@@ -242,8 +242,8 @@ void readCells
 (
     IFstream& is,
     DynamicList<cellShape>& cellVerts,
-    DynamicList<label>& cellMaterial,
-    DynamicList<label>& boundaryFaceIndices,
+    dynamicLabelList& cellMaterial,
+    dynamicLabelList& boundaryFaceIndices,
     DynamicList<face>& boundaryFaces
 )
 {
@@ -514,7 +514,7 @@ void readDOFS
         << " trying to read vertex indices."
         << endl;
 
-    DynamicList<label> vertices;
+    dynamicLabelList vertices;
     while (true)
     {
         string line;
@@ -604,14 +604,14 @@ int main(int argc, char *argv[])
     // Points
     DynamicList<point> points;
     // Original unv point label
-    DynamicList<label> unvPointID;
+    dynamicLabelList unvPointID;
 
     // Cells
     DynamicList<cellShape> cellVerts;
-    DynamicList<label> cellMat;
+    dynamicLabelList cellMat;
 
     // Boundary faces
-    DynamicList<label> boundaryFaceIndices;
+    dynamicLabelList boundaryFaceIndices;
     DynamicList<face> boundaryFaces;
 
     // Patch names and patchFace indices.
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
index c52daf24e..1cc5b8b4d 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
@@ -212,7 +212,7 @@ Foam::label Foam::meshDualiser::addInternalFace
     const bool edgeOrder,
     const label dualCell0,
     const label dualCell1,
-    const DynamicList<label>& verts,
+    const dynamicLabelList& verts,
     directTopoChange& meshMod
 ) const
 {
@@ -330,7 +330,7 @@ Foam::label Foam::meshDualiser::addBoundaryFace
 
     const label dualCellI,
     const label patchI,
-    const DynamicList<label>& verts,
+    const dynamicLabelList& verts,
     directTopoChange& meshMod
 ) const
 {
@@ -423,7 +423,7 @@ void Foam::meshDualiser::createFacesAroundEdge
     //    << endl;
 
     // Walk and collect face.
-    DynamicList<label> verts(100);
+    dynamicLabelList verts(100);
 
     if (edgeToDualPoint_[edgeI] != -1)
     {
@@ -571,7 +571,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
 
 
     // Walk and collect face.
-    DynamicList<label> verts(100);
+    dynamicLabelList verts(100);
 
     verts.append(faceToDualPoint_[faceI]);
     verts.append(edgeToDualPoint_[fEdges[fp]]);
@@ -672,7 +672,7 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
         // Starting face
         label faceI = startFaceI;
 
-        DynamicList<label> verts(4);
+        dynamicLabelList verts(4);
 
         while (true)
         {
@@ -770,7 +770,7 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
         label faceI = startFaceI;
 
         // Storage for face
-        DynamicList<label> verts(mesh_.faces()[faceI].size());
+        dynamicLabelList verts(mesh_.faces()[faceI].size());
 
         // Starting point.
         verts.append(pointToDualPoint_[pointI]);
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
index 20b1d60c1..0da31d5af 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
@@ -47,7 +47,7 @@ SourceFiles
 #ifndef meshDualiser_H
 #define meshDualiser_H
 
-#include "DynamicList.H"
+#include "dynamicLabelList.H"
 #include "PackedBoolList.H"
 #include "boolList.H"
 #include "typeInfo.H"
@@ -122,7 +122,7 @@ class meshDualiser
             const bool edgeOrder,
             const label dualCell0,
             const label dualCell1,
-            const DynamicList<label>& verts,
+            const dynamicLabelList& verts,
             directTopoChange& meshMod
         ) const;
 
@@ -135,7 +135,7 @@ class meshDualiser
 
             const label dualCellI,
             const label patchI,
-            const DynamicList<label>& verts,
+            const dynamicLabelList& verts,
             directTopoChange& meshMod
         ) const;
 
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
index 719902b96..359753794 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
@@ -47,7 +47,7 @@ void sammMesh::readBoundary()
     labelList pointLabels(4);
     labelList pointLabelsTri(3);
 
-    labelList patchLabels(1000, -1);
+    labelList patchLabels(1000, label(-1));
 
     word patchType;
     patchTypes_.setSize(1000);
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readCells.C b/applications/utilities/mesh/conversion/sammToFoam/readCells.C
index b8981bcaf..000ec33fa 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readCells.C
@@ -230,7 +230,7 @@ void sammMesh::readCells()
     {
         IFstream cellsFile(cellsFileName);
 
-        labelList labels(24, -1);
+        labelList labels(24, label(-1));
         label lineLabel, sammLabel, regionLabel, typeFlag;
 
         for (label cellI = 0; cellI < nCells; cellI++)
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/foamMeshToStar.C b/applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/foamMeshToStar.C
index e3baa5381..92d4c3603 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/foamMeshToStar.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/foamMeshToStar.C
@@ -290,7 +290,7 @@ void writeCells(const polyMesh& mesh, const fileName& timeName)
         const labelList & cFaces  = cells[cellId];
 
         // create (beg,end) indices
-        List<label> indices(cFaces.size() + 1);
+        labelList indices(cFaces.size() + 1);
         indices[0] = indices.size();
 
         label count = indices.size();
diff --git a/applications/utilities/mesh/conversion/starToFoam/readBoundary.C b/applications/utilities/mesh/conversion/starToFoam/readBoundary.C
index ec0b7c2d0..2da3e669f 100644
--- a/applications/utilities/mesh/conversion/starToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/starToFoam/readBoundary.C
@@ -47,7 +47,7 @@ void starMesh::readBoundary()
     labelList pointLabels(4);
     labelList pointLabelsTri(3);
 
-    labelList patchLabels(1000, -1);
+    labelList patchLabels(1000, label(-1));
 
     word patchType;
     patchTypes_.setSize(1000);
diff --git a/applications/utilities/mesh/conversion/starToFoam/readCells.C b/applications/utilities/mesh/conversion/starToFoam/readCells.C
index 1f6c3b515..e145dbf3d 100644
--- a/applications/utilities/mesh/conversion/starToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/starToFoam/readCells.C
@@ -275,7 +275,7 @@ void starMesh::readCells()
     {
         IFstream cellsFile(cellsFileName);
 
-        labelList labels(24, -1);
+        labelList labels(24, label(-1));
         label lineLabel, starLabel, regionLabel, typeFlag;
 
         for (label cellI = 0; cellI < nCells; cellI++)
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index f4afb52e7..276d3747f 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
         HashTable<label> zoneMap(nZones);
 
         // Cells per zone.
-        List<DynamicList<label> > zoneCells(nZones);
+        List<dynamicLabelList > zoneCells(nZones);
 
         // Running cell counter
         label cellI = 0;
diff --git a/applications/utilities/mesh/generation/blockMesh/mergePatchPairsOld.H b/applications/utilities/mesh/generation/blockMesh/mergePatchPairsOld.H
index 675835e84..938039750 100644
--- a/applications/utilities/mesh/generation/blockMesh/mergePatchPairsOld.H
+++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairsOld.H
@@ -173,7 +173,7 @@
         HashTable<label> zoneMap(nZones);
 
         // Cells per zone.
-        List<DynamicList<label> > zoneCells(nZones);
+        List<dynamicLabelList > zoneCells(nZones);
 
         // Running cell counter
         label cellI = 0;
diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C
index 02f74e65a..19a269bba 100644
--- a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C
+++ b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C
@@ -397,7 +397,7 @@ int main(int argc, char *argv[])
 
     // Write patches
     // Create patch addressing
-    List<DynamicList<label> > patchAddr(patches.size());
+    List<dynamicLabelList > patchAddr(patches.size());
 
     forAll(facets, faceI)
     {
diff --git a/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C
index 4d6c94efe..0d763f638 100644
--- a/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C
+++ b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C
@@ -48,7 +48,7 @@ void getPatchIds
 (
     const triSurf& origSurf,
     const wordList& patchNames,
-    DynamicList<label>& patchIds
+    dynamicLabelList& patchIds
 )
 {
     const geometricSurfacePatchList& origPatches = origSurf.patches();
@@ -189,7 +189,7 @@ autoPtr<triSurf> mergeSurfacePatches
     word newPatchType = origPatches[patchIds[0]].geometricType();
 
     // Create patch addressing
-    List<DynamicList<label> > patchAddr(origPatches.size()+1);
+    List<dynamicLabelList > patchAddr(origPatches.size()+1);
 
     forAll(origFacets, faceI)
     {
@@ -331,7 +331,7 @@ int main(int argc, char *argv[])
     triSurf origSurf(inFileName);
 
     // Get patch ids
-    DynamicList<label> patchIds;
+    dynamicLabelList patchIds;
 
     if (args.options().found("patchNames"))
     {
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index bb1030359..f78a9dc08 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
     fZone.checkParallelSync(true);
 
     // Patches to put baffles into
-    DynamicList<label> newPatches(1);
+    dynamicLabelList newPatches(1);
 
     word patchName(args.additionalArgs()[1]);
     newPatches.append(findPatchID(mesh, patchName));
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index ca9693f18..2cf7d3160 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -481,7 +481,7 @@ void Foam::mergePolyMesh::merge()
         {
             Info << "Updating point zones" << endl;
 
-            List<DynamicList<label> > pzPoints(pointZoneNames_.size());
+            List<dynamicLabelList > pzPoints(pointZoneNames_.size());
             forAll(pointZones_, pointI)
             {
                 label zoneID = pointZones_[pointI];
@@ -506,7 +506,7 @@ void Foam::mergePolyMesh::merge()
         {
             Info << "Updating face zones" << endl;
 
-            List<DynamicList<label> > fzFaces(faceZoneNames_.size());
+            List<dynamicLabelList > fzFaces(faceZoneNames_.size());
             List<DynamicList<bool> >  fzFlips(faceZoneNames_.size());
 
             forAll(faceZones_, faceI)
@@ -540,7 +540,7 @@ void Foam::mergePolyMesh::merge()
         {
             Info << "Updating cell zones" << endl;
 
-            List<DynamicList<label> > czCells(cellZoneNames_.size());
+            List<dynamicLabelList > czCells(cellZoneNames_.size());
             forAll(cellZones_, cellI)
             {
                 label zoneID = cellZones_[cellI];
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
index e6e2ce8fc..99d64914f 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
@@ -74,16 +74,16 @@ class mergePolyMesh
         DynamicList<word> cellZoneNames_;
 
         //- Point zones
-        DynamicList<label>  pointZones_;
+        dynamicLabelList  pointZones_;
 
         //- Face zones
-        DynamicList<label>  faceZones_;
+        dynamicLabelList  faceZones_;
 
         //- Face zone Flips
         DynamicList<bool>  faceZoneFlips_;
 
         //- Cell zones
-        DynamicList<label> cellZones_;
+        dynamicLabelList cellZones_;
 
 
     // Private Member Functions
diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
index 392a9b0b6..2650a79a0 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
+++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
@@ -56,7 +56,7 @@ string getLine(std::ifstream& is)
 // Read space-separated vertices (with optional '/' arguments)
 labelList parseVertices(const string& line)
 {
-    DynamicList<label> verts;
+    dynamicLabelList verts;
 
     // Assume 'l' is followed by space.
     string::size_type endNum = 1;
diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.C b/applications/utilities/mesh/manipulation/setSet/writeFuns.C
index 90683c833..ab6cd947a 100644
--- a/applications/utilities/mesh/manipulation/setSet/writeFuns.C
+++ b/applications/utilities/mesh/manipulation/setSet/writeFuns.C
@@ -30,6 +30,15 @@ License
 #include <sys/endian.h>
 #endif
 
+// MacOSX
+#ifdef __DARWIN_BYTE_ORDER
+#if __DARWIN_BYTE_ORDER==__DARWIN_BIG_ENDIAN
+#undef LITTLE_ENDIAN
+#else
+#undef BIG_ENDIAN
+#endif
+#endif
+
 #if defined(LITTLE_ENDIAN) \
  || defined(_LITTLE_ENDIAN) \
  || defined(__LITTLE_ENDIAN)
@@ -43,9 +52,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void Foam::writeFuns::swapWord(label& word32)
+void Foam::writeFuns::swapWord(int32_t& word32)
 {
-    char* mem =  reinterpret_cast<char*>(&word32);
+    char* mem = reinterpret_cast<char*>(&word32);
 
     char a = mem[0];
     mem[0] = mem[3];
@@ -57,7 +66,7 @@ void Foam::writeFuns::swapWord(label& word32)
 }
 
 
-void Foam::writeFuns::swapWords(const label nWords, label* words32)
+void Foam::writeFuns::swapWords(const label nWords, int32_t* words32)
 {
     for (label i = 0; i < nWords; i++)
     {
@@ -75,9 +84,9 @@ void Foam::writeFuns::write
 {
     if (binary)
     {
-#       ifdef LITTLEENDIAN
-        swapWords(fField.size(),  reinterpret_cast<label*>(fField.begin()));
-#       endif
+        #ifdef LITTLEENDIAN
+        swapWords(fField.size(), reinterpret_cast<int32_t*>(fField.begin()));
+        #endif
 
         os.write
         (
@@ -125,9 +134,13 @@ void Foam::writeFuns::write
 {
     if (binary)
     {
-#       ifdef LITTLEENDIAN
-        swapWords(elems.size(),  reinterpret_cast<label*>(elems.begin()));
-#       endif
+        #ifdef LITTLEENDIAN
+        swapWords
+        (
+            (sizeof(label)/4)*elems.size(),
+            reinterpret_cast<int32_t*>(elems.begin())
+        );
+        #endif
         os.write
         (
             reinterpret_cast<char*>(elems.begin()),
@@ -156,7 +169,7 @@ void Foam::writeFuns::write
 (
     std::ostream& os,
     const bool binary,
-    DynamicList<label>& elems
+    dynamicLabelList& elems
 )
 {
     labelList& fld = elems.shrink();
@@ -175,7 +188,7 @@ void Foam::writeFuns::insert(const point& pt, DynamicList<floatScalar>& dest)
 
 
 // Store labelList in dest.
-void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest)
+void Foam::writeFuns::insert(const labelList& source, dynamicLabelList& dest)
 {
     forAll(source, i)
     {
@@ -187,7 +200,7 @@ void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest)
 // Store scalarField in dest
 void Foam::writeFuns::insert
 (
-    const List<scalar>& source,
+    const scalarList& source,
     DynamicList<floatScalar>& dest
 )
 {
@@ -202,7 +215,7 @@ void Foam::writeFuns::insert
 void Foam::writeFuns::insert
 (
     const labelList& map,
-    const List<scalar>& source,
+    const scalarList& source,
     DynamicList<floatScalar>& dest
 )
 {
diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.H b/applications/utilities/mesh/manipulation/setSet/writeFuns.H
index b54b041b9..dd700f9dc 100644
--- a/applications/utilities/mesh/manipulation/setSet/writeFuns.H
+++ b/applications/utilities/mesh/manipulation/setSet/writeFuns.H
@@ -36,9 +36,10 @@ SourceFiles
 #define writeFunctions_H
 
 #include "labelList.H"
+#include "scalarList.H"
 #include "floatScalar.H"
 #include "OFstream.H"
-#include "DynamicList.H"
+#include "dynamicLabelList.H"
 #include "point.H"
 
 using namespace Foam;
@@ -55,15 +56,20 @@ namespace Foam
 
 class writeFuns
 {
-    //- Swap halves of word.
-    static void swapWord(label& word32);
-    static void swapWords(const label nWords, label* words32);
+    // Private member functions
+
+        //- Swap halves of word
+        static void swapWord(int32_t& word32);
+
+        //- Swap halves of word
+        static void swapWords(const label nWords, int32_t* words32);
+
 
 public:
 
     //- Write ascii or binary. If binary optionally in-place swaps argument
     static void write(std::ostream&, const bool, DynamicList<floatScalar>&);
-    static void write(std::ostream&, const bool, DynamicList<label>&);
+    static void write(std::ostream&, const bool, dynamicLabelList&);
 
     //- Write ascii or binary. If binary optionally in-place swaps argument
     static void write(std::ostream&, const bool, List<floatScalar>&);
@@ -73,15 +79,15 @@ public:
     static void insert(const point&, DynamicList<floatScalar>& dest);
 
     //- Append elements of labelList to DynamicList
-    static void insert(const labelList&, DynamicList<label>&);
+    static void insert(const labelList&, dynamicLabelList&);
     //- Append elements of scalarList to DynamicList
-    static void insert(const List<scalar>&, DynamicList<floatScalar>&);
+    static void insert(const scalarList&, DynamicList<floatScalar>&);
 
     //- Append elements of scalarList to DynamicList using map
     static void insert
     (
         const labelList& map,
-        const List<scalar>& source,
+        const scalarList& source,
         DynamicList<floatScalar>&
     );
 
diff --git a/applications/utilities/mesh/manipulation/setSet/writePatch.C b/applications/utilities/mesh/manipulation/setSet/writePatch.C
index c229cbd25..49e2dced8 100644
--- a/applications/utilities/mesh/manipulation/setSet/writePatch.C
+++ b/applications/utilities/mesh/manipulation/setSet/writePatch.C
@@ -89,7 +89,7 @@ void writePatch
         << std::endl;
 
 
-    DynamicList<label> vertLabels(nFaceVerts);
+    dynamicLabelList vertLabels(nFaceVerts);
 
     forAll(fp.localFaces(), faceI)
     {
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index e18d162dc..d0fabb323 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
         faceSet set(*iter());
         SortableList<label> faceLabels(set.toc());
 
-        DynamicList<label> addressing(set.size());
+        dynamicLabelList addressing(set.size());
         DynamicList<bool> flipMap(set.size());
 
         if (!noFlipMap)
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index ce2dfa538..732491850 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -486,7 +486,7 @@ void subsetSurfaceFields
 // Select all cells not in the region
 labelList getNonRegionCells(const labelList& cellRegion, const label regionI)
 {
-    DynamicList<label> nonRegionCells(cellRegion.size());
+    dynamicLabelList nonRegionCells(cellRegion.size());
     forAll (cellRegion, cellI)
     {
         if (cellRegion[cellI] != regionI)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
index 8f2a96b49..850c0752f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
@@ -180,10 +180,10 @@ if (fieldTimesUsed.size())
 
 // TODO: allow similar/different time-steps for each cloud
 cloudNo = 0;
-forAllConstIter(HashTable<DynamicList<label> >, cloudTimesUsed, cloudIter)
+forAllConstIter(HashTable<dynamicLabelList >, cloudTimesUsed, cloudIter)
 {
     // const word& cloudName = cloudIter.key();
-    const DynamicList<label>& timesUsed = cloudIter();
+    const dynamicLabelList& timesUsed = cloudIter();
 
     if (timesUsed.size() && cloudNo == 0)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index b4d4e2e29..b17e741d5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -175,15 +175,15 @@ int main(int argc, char *argv[])
     Map<scalar>  timeIndices;
 
     // Track the time indices used by the volume fields
-    DynamicList<label> fieldTimesUsed;
+    dynamicLabelList fieldTimesUsed;
 
     // Track the time indices used by each cloud
-    HashTable<DynamicList<label> > cloudTimesUsed;
+    HashTable<dynamicLabelList > cloudTimesUsed;
 
     // Create a new DynamicList for each cloud
     forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
     {
-        cloudTimesUsed.insert(cloudIter.key(), DynamicList<label>());
+        cloudTimesUsed.insert(cloudIter.key(), dynamicLabelList());
     }
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C
index 62889b377..4d3b67ae3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C
@@ -151,7 +151,7 @@ Foam::fieldviewTopology::fieldviewTopology
     const cellModel& hex = *(cellModeller::lookup("hex"));
 
     // Pre calculate headers for cells not on walls
-    labelList notWallFlags(6, NOT_A_WALL);
+    List<int> notWallFlags(6, NOT_A_WALL);
     label tetNotWall = fv_encode_elem_header
     (
         FV_TET_ELEM_ID, notWallFlags.begin()
@@ -181,7 +181,7 @@ Foam::fieldviewTopology::fieldviewTopology
 
     const faceList& allFaces = mesh.faces();
 
-    labelList wallFlags(6);
+    List<int> wallFlags(6);
     forAll(cellShapes, celli)
     {
         const cellShape& cellShape = cellShapes[celli];
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index 00e2e6e85..c01236cf9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -125,7 +125,7 @@ labelList getSelectedPatches
     const List<wordRe>& excludePatches  //HashSet<word>& excludePatches
 )
 {
-    DynamicList<label> patchIDs(patches.size());
+    dynamicLabelList patchIDs(patches.size());
 
     Info<< "Combining patches:" << endl;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
index 6c56b4084..0cd8075d4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
@@ -395,7 +395,8 @@ void Foam::tecplotWriter::writeConnectivity
     INTEGER4  NumFaceNodes    = 2*pp.nEdges();
 
     // All faces (=edges) have 2 nodes
-    List<INTEGER4> FaceNodeCounts(NumFaces, 2);
+    List<INTEGER4> FaceNodeCounts(NumFaces);
+    FaceNodeCounts = 2;
 
     List<INTEGER4> FaceNodes(NumFaceNodes);
     label nodeI = 0;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/faMeshWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/faMeshWriter.C
index 1427fe329..61cdca7a1 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/faMeshWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/faMeshWriter.C
@@ -64,8 +64,8 @@ Foam::faMeshWriter::faMeshWriter
     os_ << "CELLS " << aMesh.nFaces() << ' ' << nFaceVerts
         << std::endl;
 
-    DynamicList<label> vertLabels(nFaceVerts);
-    DynamicList<label> faceTypes(nFaceVerts);
+    dynamicLabelList vertLabels(nFaceVerts);
+    dynamicLabelList faceTypes(nFaceVerts);
 
     forAll(pp, faceI)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 4a4275f10..5422e23dd 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -176,7 +176,7 @@ labelList getSelectedPatches
     const HashSet<word>& excludePatches
 )
 {
-    DynamicList<label> patchIDs(patches.size());
+    dynamicLabelList patchIDs(patches.size());
 
     Info<< "Combining patches:" << endl;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C
index cc741c7e8..1db4927e6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C
@@ -91,7 +91,7 @@ Foam::internalWriter::internalWriter
         << std::endl;
 
 
-    DynamicList<label> vertLabels(nFaceVerts);
+    dynamicLabelList vertLabels(nFaceVerts);
 
     forAll(vtkVertLabels, cellI)
     {
@@ -110,7 +110,7 @@ Foam::internalWriter::internalWriter
     os_ << "CELL_TYPES " << vtkCellTypes.size() << std::endl;
 
     // Make copy since writing might swap stuff.
-    DynamicList<label> cellTypes(vtkCellTypes.size());
+    dynamicLabelList cellTypes(vtkCellTypes.size());
 
     writeFuns::insert(vtkCellTypes, cellTypes);
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
index f59004742..64fe87266 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
@@ -94,8 +94,8 @@ Foam::patchWriter::patchWriter
     os_ << "CELLS " << nFaces_ << ' ' << nFaceVerts
         << std::endl;
 
-    DynamicList<label> vertLabels(nFaceVerts);
-    DynamicList<label> faceTypes(nFaceVerts);
+    dynamicLabelList vertLabels(nFaceVerts);
+    dynamicLabelList faceTypes(nFaceVerts);
 
     label offset = 0;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
index 25f143e2a..5da1895d7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
@@ -110,7 +110,7 @@ void writeFaceSet
     pStream << "POLYGONS " << fp.size() << ' ' << nFaceVerts
         << std::endl;
 
-    DynamicList<label> vertLabels(nFaceVerts);
+    dynamicLabelList vertLabels(nFaceVerts);
 
     forAll(lf, faceI)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
index c839ca865..d8828de1c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
@@ -53,7 +53,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void Foam::writeFuns::swapWord(label& word32)
+void Foam::writeFuns::swapWord(int32_t& word32)
 {
     char* mem = reinterpret_cast<char*>(&word32);
 
@@ -67,7 +67,7 @@ void Foam::writeFuns::swapWord(label& word32)
 }
 
 
-void Foam::writeFuns::swapWords(const label nWords, label* words32)
+void Foam::writeFuns::swapWords(const label nWords, int32_t* words32)
 {
     for (label i = 0; i < nWords; i++)
     {
@@ -85,9 +85,10 @@ void Foam::writeFuns::write
 {
     if (binary)
     {
-#       ifdef LITTLEENDIAN
-        swapWords(fField.size(), reinterpret_cast<label*>(fField.begin()));
-#       endif
+        #ifdef LITTLEENDIAN
+        swapWords(fField.size(), reinterpret_cast<int32_t*>(fField.begin()));
+        #endif
+
         os.write
         (
             reinterpret_cast<char*>(fField.begin()),
@@ -134,9 +135,13 @@ void Foam::writeFuns::write
 {
     if (binary)
     {
-#       ifdef LITTLEENDIAN
-        swapWords(elems.size(), reinterpret_cast<label*>(elems.begin()));
-#       endif
+        #ifdef LITTLEENDIAN
+        swapWords
+        (
+            (sizeof(label)/4)*elems.size(),
+            reinterpret_cast<int32_t*>(elems.begin())
+        );
+        #endif
         os.write
         (
             reinterpret_cast<char*>(elems.begin()),
@@ -165,7 +170,7 @@ void Foam::writeFuns::write
 (
     std::ostream& os,
     const bool binary,
-    DynamicList<label>& elems
+    dynamicLabelList& elems
 )
 {
     labelList& fld = elems.shrink();
@@ -269,7 +274,7 @@ void Foam::writeFuns::insert(const tensor& pt, DynamicList<floatScalar>& dest)
 }
 
 
-void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest)
+void Foam::writeFuns::insert(const labelList& source, dynamicLabelList& dest)
 {
     forAll(source, i)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
index d18e82853..4308df39b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
@@ -55,10 +55,11 @@ class writeFuns
 {
     // Private member functions
 
-        // Swap halves of word.
+        //- Swap halves of word
+        static void swapWord(int32_t& word32);
 
-            static void swapWord(label& word32);
-            static void swapWords(const label nWords, label* words32);
+        //- Swap halves of word
+        static void swapWords(const label nWords, int32_t* words32);
 
 
 public:
@@ -68,7 +69,7 @@ public:
         static void write(std::ostream&, const bool, List<floatScalar>&);
         static void write(std::ostream&, const bool, DynamicList<floatScalar>&);
         static void write(std::ostream&, const bool, labelList&);
-        static void write(std::ostream&, const bool, DynamicList<label>&);
+        static void write(std::ostream&, const bool, dynamicLabelList&);
 
 
     // Write header
@@ -105,7 +106,7 @@ public:
 
 
     //- Append elements to DynamicList
-    static void insert(const labelList&, DynamicList<label>&);
+    static void insert(const labelList&, dynamicLabelList&);
     template<class Type>
     static void insert(const List<Type>&, DynamicList<floatScalar>&);
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C
index 065da4046..e7600f0cc 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C
@@ -64,7 +64,7 @@ void writePatchGeom
         << std::endl;
 
 
-    DynamicList<label> vertLabels(nFaceVerts);
+    dynamicLabelList vertLabels(nFaceVerts);
 
     forAll(faces, faceI)
     {
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
index 7c7f2b16d..d853cd473 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
@@ -43,9 +43,9 @@ static fileName caseDir;
 
 static instantList timeDirs;
 
-static List<word> fieldNames;
-static List<word> lagrangianScalarNames;
-static List<word> lagrangianVectorNames;
+static wordList fieldNames;
+static wordList lagrangianScalarNames;
+static wordList lagrangianVectorNames;
 static label var2field[maxNames];
 
 static Time *runTimePtr = 0;
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
index ed15a9a2b..c377f5f69 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
@@ -50,7 +50,7 @@ void Foam::readerDatabase::getPolyHedra()
     const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
     const cellModel& hex = *(cellModeller::lookup("hex"));
 
-    DynamicList<label> polys(mesh().nCells()/100 + 1);
+    dynamicLabelList polys(mesh().nCells()/100 + 1);
 
     const cellShapeList& cellShapes = mesh().cellShapes();
 
diff --git a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/globalFoam.H b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/globalFoam.H
index ec398ea88..14453dcdd 100644
--- a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/globalFoam.H
+++ b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/globalFoam.H
@@ -44,9 +44,9 @@ static fileName caseDir;
 
 static instantList TimeList;
 
-static List<word> fieldNames;
-static List<word> lagrangianScalarNames;
-static List<word> lagrangianVectorNames;
+static wordList fieldNames;
+static wordList lagrangianScalarNames;
+static wordList lagrangianVectorNames;
 static label var2field[maxNames];
 
 static Time *runTimePtr = 0;
@@ -57,7 +57,7 @@ static Cloud<passiveParticle> *sprayPtr = 0;
 static fvMesh* secondMeshPtr = 0;
 static int nSecondMeshPatches = 0;
 static char secondMeshName[] = "cells_2";
-static List<word> secondMeshFieldNames;
+static wordList secondMeshFieldNames;
 static label secondMeshVar2field[maxNames];
 static bool secondMeshIsScalar[maxNames];
 static bool secondMeshIsVector[maxNames];
@@ -71,7 +71,7 @@ static word faScalarName             = "areaScalarField";
 static word faVectorName             = "areaVectorField";
 static word faTensorName             = "areaTensorField";
 static char faMeshName[] = "faCells";
-static List<word> faMeshFieldNames;
+static wordList faMeshFieldNames;
 static label faMeshVar2field[maxNames];
 static bool faMeshIsScalar[maxNames];
 static bool faMeshIsVector[maxNames];
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 408f1c2de..4a1a7f291 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
 
 
     // calc starting ids for particles on each processor
-    List<label> startIds(numIds.size(), 0);
+    labelList startIds(numIds.size(), 0);
     for (label i = 0; i < numIds.size()-1; i++)
     {
         startIds[i+1] += startIds[i] + numIds[i];
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
index b41f16be3..023792332 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
@@ -59,7 +59,7 @@ void Foam::channelIndex::walkOppositeFaces
     const faceList& faces = mesh.faces();
     label nBnd = mesh.nFaces() - mesh.nInternalFaces();
 
-    DynamicList<label> frontFaces(startFaces);
+    dynamicLabelList frontFaces(startFaces);
     forAll(frontFaces, i)
     {
         label faceI = frontFaces[i];
@@ -93,7 +93,7 @@ void Foam::channelIndex::walkOppositeFaces
         }
 
         // Transfer across cells
-        DynamicList<label> newFrontFaces(frontFaces.size());
+        dynamicLabelList newFrontFaces(frontFaces.size());
 
         forAll(frontFaces, i)
         {
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index bd3c36904..821998ef7 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -427,7 +427,7 @@ int main(int argc, char *argv[])
         );
 
         List<boundBox> bbsTarget(nProcsTarget);
-        List<bool> bbsTargetSet(nProcsTarget, false);
+        boolList bbsTargetSet(nProcsTarget, false);
 
         for (int procISource=0; procISource<nProcsSource; procISource++)
         {
diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
index d63d48e66..dbee8da59 100644
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -135,7 +135,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
             label sourceParticleI = 0;
 
             // Indices of source particles that get added to targetParcels
-            DynamicList<label> addParticles(sourceParcels.size());
+            dynamicLabelList addParticles(sourceParcels.size());
 
             // Unmapped particles
             labelHashSet unmappedSource(sourceParcels.size());
diff --git a/applications/utilities/preProcessing/viewFactorsGen/shootRays.H b/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
index 3cdca36d6..e6e031a4f 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
+++ b/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
@@ -11,8 +11,8 @@ for (label procI = 0; procI < Pstream::nProcs(); procI++)
 
     DynamicField<point> start(coarseMesh.nFaces());
     DynamicField<point> end(start.size());
-    DynamicList<label> startIndex(start.size());
-    DynamicList<label> endIndex(start.size());
+    dynamicLabelList startIndex(start.size());
+    dynamicLabelList endIndex(start.size());
 
     const pointField& myFc = remoteCoarseCf[Pstream::myProcNo()];
     const vectorField& myArea = remoteCoarseSf[Pstream::myProcNo()];
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index 07a927037..3f6b3f82a 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -400,9 +400,9 @@ int main(int argc, char *argv[])
 
     // Determine rays between coarse face centres
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    DynamicList<label> rayStartFace(nCoarseFaces + 0.01*nCoarseFaces);
+    dynamicLabelList rayStartFace(nCoarseFaces + 0.01*nCoarseFaces);
 
-    DynamicList<label> rayEndFace(rayStartFace.size());
+    dynamicLabelList rayEndFace(rayStartFace.size());
 
     globalIndex globalNumbering(nCoarseFaces);
 
@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE,
             false
         ),
-        List<label>(1, map.constructSize())
+        labelList(1, map.constructSize())
     );
     consMapDim.write();
 
@@ -510,7 +510,7 @@ int main(int argc, char *argv[])
     List<List<point> > compactFineSf(map.constructSize());
     List<List<point> > compactFineCf(map.constructSize());
 
-    DynamicList<label> compactPatchId(map.constructSize());
+    dynamicLabelList compactPatchId(map.constructSize());
 
     // Insert my coarse local values
     SubList<point>(compactCoarseSf, nCoarseFaces).assign(localCoarseSf);
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index bef7f03e2..0e1a5241c 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -236,7 +236,7 @@ int main(int argc, char *argv[])
     // ~~~~~~~~~~~~~~~
 
     {
-        DynamicList<label> illegalFaces(surf.size()/100 + 1);
+        dynamicLabelList illegalFaces(surf.size()/100 + 1);
 
         forAll(surf, faceI)
         {
@@ -350,7 +350,7 @@ int main(int argc, char *argv[])
 
         // Dump for subsetting
         {
-            DynamicList<label> problemFaces(surf.size()/100+1);
+            dynamicLabelList problemFaces(surf.size()/100+1);
 
             forAll(triQ, faceI)
             {
@@ -481,7 +481,7 @@ int main(int argc, char *argv[])
     // Check manifold
     // ~~~~~~~~~~~~~~
 
-    DynamicList<label> problemFaces(surf.size()/100 + 1);
+    dynamicLabelList problemFaces(surf.size()/100 + 1);
 
     const labelListList& eFaces = surf.edgeFaces();
 
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index 70a74a0a6..042203575 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -61,11 +61,11 @@ void readNASEdges
     // coordinates of point
     DynamicList<point> points;
     // Nastran index of point
-    DynamicList<label> pointIndices;
+    dynamicLabelList pointIndices;
 
     // beams
     DynamicList<edge> edges;
-    DynamicList<label> edgeIndices;
+    dynamicLabelList edgeIndices;
 
 
     while (is.good())
diff --git a/applications/utilities/surface/surfaceToPatch/boundaryMesh.C b/applications/utilities/surface/surfaceToPatch/boundaryMesh.C
index 845d32c9a..9e02b4890 100644
--- a/applications/utilities/surface/surfaceToPatch/boundaryMesh.C
+++ b/applications/utilities/surface/surfaceToPatch/boundaryMesh.C
@@ -193,7 +193,7 @@ void Foam::boundaryMesh::markEdges
     const label edgeI,
     const label distance,
     labelList& minDistance,
-    DynamicList<label>& visited
+    dynamicLabelList& visited
 ) const
 {
     if (distance < maxDistance)
@@ -865,8 +865,8 @@ Foam::labelList Foam::boundaryMesh::getNearest
     // Divide faces into two bins acc. to normal
     // - left of splitNormal
     // - right ,,
-    DynamicList<label> leftFaces(mesh().size()/2);
-    DynamicList<label> rightFaces(mesh().size()/2);
+    dynamicLabelList leftFaces(mesh().size()/2);
+    dynamicLabelList rightFaces(mesh().size()/2);
 
     forAll(mesh(), bFaceI)
     {
@@ -1253,7 +1253,7 @@ void Foam::boundaryMesh::patchify
 
     if (newPatchPtrList.size())
     {
-        List<DynamicList<label> > patchFaces(nNewPatches);
+        List<dynamicLabelList > patchFaces(nNewPatches);
 
         // Give reasonable estimate for size of patches
         label nAvgFaces =
@@ -1516,7 +1516,7 @@ void Foam::boundaryMesh::setExtraEdges(const label edgeI)
     labelList minDistance(mesh().nEdges(), -1);
 
     // All edge labels encountered
-    DynamicList<label> visitedEdges;
+    dynamicLabelList visitedEdges;
 
     // Floodfill from edgeI starting from distance 0. Stop at distance.
     markEdges(8, edgeI, 0, minDistance, visitedEdges);
diff --git a/applications/utilities/surface/surfaceToPatch/boundaryMesh.H b/applications/utilities/surface/surfaceToPatch/boundaryMesh.H
index 1d1adead8..98ae5fb38 100644
--- a/applications/utilities/surface/surfaceToPatch/boundaryMesh.H
+++ b/applications/utilities/surface/surfaceToPatch/boundaryMesh.H
@@ -132,7 +132,7 @@ class boundaryMesh
             const label edgeI,
             const label distance,
             labelList& minDistance,
-            DynamicList<label>& visited
+            dynamicLabelList& visited
         ) const;
 
         //- Get index of polypatch by name
diff --git a/applications/utilities/thermophysical/IFCLookUpTableGen/IFCLookUpTableGen.C b/applications/utilities/thermophysical/IFCLookUpTableGen/IFCLookUpTableGen.C
index 60cfa7859..1747a2c83 100644
--- a/applications/utilities/thermophysical/IFCLookUpTableGen/IFCLookUpTableGen.C
+++ b/applications/utilities/thermophysical/IFCLookUpTableGen/IFCLookUpTableGen.C
@@ -173,11 +173,11 @@ int main(int argc, char *argv[])
     // Create Look Up Table
     interpolationLookUpTable<scalar> LookUpTable(control);
 
-    const List<label>& dim = LookUpTable.dim();
+    const labelList& dim = LookUpTable.dim();
 
-    const List<scalar>& min = LookUpTable.min();
+    const scalarList& min = LookUpTable.min();
 
-    const List<scalar>& delta = LookUpTable.delta();
+    const scalarList& delta = LookUpTable.delta();
 
     label count = 0;
 
diff --git a/etc/settings.csh b/etc/settings.csh
index 71a110a5a..ef74bd6fa 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -41,7 +41,8 @@ setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
 # wmake configuration
 setenv WM_DIR $WM_PROJECT_DIR/wmake
 setenv WM_LINK_LANGUAGE c++
-setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
+setenv WM_LABEL_OPTION "Int$WM_LABEL_SIZE"
+setenv WM_OPTIONS "$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION"
 set path=($WM_DIR $path)
 
 # base configuration
diff --git a/etc/settings.sh b/etc/settings.sh
index 4f8ae8790..6b138c0c5 100755
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -79,7 +79,8 @@ export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl
 # wmake configuration
 export WM_DIR=$WM_PROJECT_DIR/wmake
 export WM_LINK_LANGUAGE=c++
-export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
+export WM_LABEL_OPTION="Int$WM_LABEL_SIZE"
+export WM_OPTIONS="$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION"
 export PATH=$WM_DIR:$PATH
 
 # base configuration
diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C
index 79e6ff439..c50d84d62 100644
--- a/src/conversion/ensight/part/ensightPart.C
+++ b/src/conversion/ensight/part/ensightPart.C
@@ -40,7 +40,7 @@ Foam::List<Foam::word> Foam::ensightPart::elemTypes_(0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-bool Foam::ensightPart::isFieldDefined(const List<scalar>& field) const
+bool Foam::ensightPart::isFieldDefined(const scalarList& field) const
 {
     forAll(elemLists_, elemI)
     {
diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H
index 2c87584b4..eb60906bd 100644
--- a/src/conversion/ensight/part/ensightPart.H
+++ b/src/conversion/ensight/part/ensightPart.H
@@ -60,7 +60,7 @@ class ensightPart
     // Private data
 
         // Static data members
-        static List<word> elemTypes_;
+        static wordList elemTypes_;
 
 
 protected:
@@ -126,7 +126,7 @@ protected:
         void reconstruct(Istream&);
 
         //- check for fully defined fields
-        bool isFieldDefined(const List<scalar>&) const;
+        bool isFieldDefined(const scalarList&) const;
 
         //- write the part header
         void writeHeader(ensightFile&, bool withDescription=false) const;
@@ -135,7 +135,7 @@ protected:
         void writeFieldList
         (
             ensightFile& os,
-            const List<scalar>& field,
+            const scalarList& field,
             const labelList& idList
         ) const;
 
@@ -212,7 +212,7 @@ public:
 
     // Static members
 
-        virtual List<word> const& elementTypes() const
+        virtual wordList const& elementTypes() const
         {
             return elemTypes_;
         }
@@ -292,16 +292,16 @@ public:
         void writeScalarField
         (
             ensightFile&,
-            const List<scalar>& field
+            const scalarList& field
         ) const;
 
         //- write vector field components
         void writeVectorField
         (
             ensightFile&,
-            const List<scalar>& field0,
-            const List<scalar>& field1,
-            const List<scalar>& field2
+            const scalarList& field0,
+            const scalarList& field1,
+            const scalarList& field2
         ) const;
 
 
diff --git a/src/conversion/ensight/part/ensightPartCells.H b/src/conversion/ensight/part/ensightPartCells.H
index 3f828e39b..44809afda 100644
--- a/src/conversion/ensight/part/ensightPartCells.H
+++ b/src/conversion/ensight/part/ensightPartCells.H
@@ -88,7 +88,7 @@ protected:
     };
 
     // Static data members
-    static List<word> elemTypes_;
+    static wordList elemTypes_;
 
 
 public:
@@ -140,7 +140,7 @@ public:
     // Member Functions
 
         //- static listing of the element types
-        virtual List<word> const& elementTypes() const
+        virtual wordList const& elementTypes() const
         {
             return elemTypes_;
         }
diff --git a/src/conversion/ensight/part/ensightPartFaces.H b/src/conversion/ensight/part/ensightPartFaces.H
index 6edecc7da..68362fa9d 100644
--- a/src/conversion/ensight/part/ensightPartFaces.H
+++ b/src/conversion/ensight/part/ensightPartFaces.H
@@ -79,7 +79,7 @@ protected:
     };
 
     // Static data members
-    static List<word> elemTypes_;
+    static wordList elemTypes_;
 
 
 public:
@@ -120,7 +120,7 @@ public:
     // Member Functions
 
         //- static listing of the element types
-        virtual List<word> const& elementTypes() const
+        virtual wordList const& elementTypes() const
         {
             return elemTypes_;
         }
diff --git a/src/conversion/ensight/part/ensightPartIO.C b/src/conversion/ensight/part/ensightPartIO.C
index 51d475c99..95020a019 100644
--- a/src/conversion/ensight/part/ensightPartIO.C
+++ b/src/conversion/ensight/part/ensightPartIO.C
@@ -55,8 +55,8 @@ void Foam::ensightPart::writeHeader
 void Foam::ensightPart::writeFieldList
 (
     ensightFile& os,
-    const List<scalar>& field,
-    const List<label>& idList
+    const scalarList& field,
+    const labelList& idList
 ) const
 {
     forAll(idList, i)
@@ -172,7 +172,7 @@ void Foam::ensightPart::writeGeometry(ensightGeoFile& os) const
 void Foam::ensightPart::writeScalarField
 (
     ensightFile& os,
-    const List<scalar>& field
+    const scalarList& field
 ) const
 {
     if (size() && field.size() && (os.allowUndef() || isFieldDefined(field)))
@@ -196,9 +196,9 @@ void Foam::ensightPart::writeScalarField
 void Foam::ensightPart::writeVectorField
 (
     ensightFile& os,
-    const List<scalar>& field0,
-    const List<scalar>& field1,
-    const List<scalar>& field2
+    const scalarList& field0,
+    const scalarList& field1,
+    const scalarList& field2
 ) const
 {
     if (size() && field0.size() && (os.allowUndef() || isFieldDefined(field0)))
diff --git a/src/conversion/ensight/part/ensightParts.C b/src/conversion/ensight/part/ensightParts.C
index e4450be95..28113b67a 100644
--- a/src/conversion/ensight/part/ensightParts.C
+++ b/src/conversion/ensight/part/ensightParts.C
@@ -248,7 +248,7 @@ void Foam::ensightParts::writeData(Ostream& os) const
 void Foam::ensightParts::writeScalarField
 (
     ensightFile& os,
-    const List<scalar>& field,
+    const scalarList& field,
     bool useFaceData
 ) const
 {
@@ -270,9 +270,9 @@ void Foam::ensightParts::writeScalarField
 void Foam::ensightParts::writeVectorField
 (
     ensightFile& os,
-    const List<scalar>& field0,
-    const List<scalar>& field1,
-    const List<scalar>& field2,
+    const scalarList& field0,
+    const scalarList& field1,
+    const scalarList& field2,
     bool useFaceData
 ) const
 {
diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H
index e530b6a37..bbd4bde03 100644
--- a/src/conversion/ensight/part/ensightParts.H
+++ b/src/conversion/ensight/part/ensightParts.H
@@ -112,7 +112,7 @@ public:
         void writeScalarField
         (
             ensightFile&,
-            const List<scalar>& field,
+            const scalarList& field,
             bool useFaceData = false
         ) const;
 
@@ -120,9 +120,9 @@ public:
         void writeVectorField
         (
             ensightFile&,
-            const List<scalar>& field0,
-            const List<scalar>& field1,
-            const List<scalar>& field2,
+            const scalarList& field0,
+            const scalarList& field1,
+            const scalarList& field2,
             bool useFaceData = false
         ) const;
 
diff --git a/src/conversion/meshReader/createPolyBoundary.C b/src/conversion/meshReader/createPolyBoundary.C
index a921ffe49..318ab7af1 100644
--- a/src/conversion/meshReader/createPolyBoundary.C
+++ b/src/conversion/meshReader/createPolyBoundary.C
@@ -189,7 +189,7 @@ void Foam::meshReader::createPolyBoundary()
         else if (patchPhysicalTypes_[patchI] == "monitoring")
         {
             // translate the "monitoring" pseudo-boundaries to face sets
-            List<label> monitoring(idList.size());
+            labelList monitoring(idList.size());
 
             label monitorI = 0;
             forAll(idList, bndI)
diff --git a/src/conversion/meshReader/meshReader.C b/src/conversion/meshReader/meshReader.C
index 25ae7f40d..e3fc9100c 100644
--- a/src/conversion/meshReader/meshReader.C
+++ b/src/conversion/meshReader/meshReader.C
@@ -103,7 +103,7 @@ void Foam::meshReader::addFaceZones(polyMesh& mesh) const
             (
                 iter.key(),
                 iter(),
-                List<bool>(iter().size(), false),
+                boolList(iter().size(), false),
                 nZone,
                 mesh.faceZones()
             )
diff --git a/src/conversion/meshReader/meshReader.H b/src/conversion/meshReader/meshReader.H
index e2a8280b8..d39440b04 100644
--- a/src/conversion/meshReader/meshReader.H
+++ b/src/conversion/meshReader/meshReader.H
@@ -220,7 +220,7 @@ private:
 
         void writeInterfaces(const objectRegistry&) const;
 
-        //- Write List<label> in constant/polyMesh
+        //- Write labelList in constant/polyMesh
         void writeMeshLabelList
         (
             const objectRegistry& registry,
diff --git a/src/conversion/meshReader/meshReaderAux.C b/src/conversion/meshReader/meshReaderAux.C
index 6ae58305c..1c6694517 100644
--- a/src/conversion/meshReader/meshReaderAux.C
+++ b/src/conversion/meshReader/meshReaderAux.C
@@ -149,7 +149,7 @@ void Foam::meshReader::writeAux(const objectRegistry& registry) const
     cellTable_.writeDict(registry);
     writeInterfaces(registry);
 
-    // write origCellId as List<label>
+    // write origCellId as labelList
     writeMeshLabelList
     (
         registry,
@@ -158,7 +158,7 @@ void Foam::meshReader::writeAux(const objectRegistry& registry) const
         IOstream::BINARY
     );
 
-    // write cellTableId as List<label>
+    // write cellTableId as labelList
     // this is crucial for later conversion back to ccm/starcd
     writeMeshLabelList
     (
diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.C b/src/conversion/meshReader/starcd/STARCDMeshReader.C
index d84e4e678..ade6c6193 100644
--- a/src/conversion/meshReader/starcd/STARCDMeshReader.C
+++ b/src/conversion/meshReader/starcd/STARCDMeshReader.C
@@ -640,9 +640,9 @@ void Foam::meshReaders::STARCD::readBoundary(const fileName& inputName)
     label lineLabel, starCellId, cellFaceId, starRegion, configNumber;
     word patchType;
 
-    labelList mapToFoamPatchId(1000, -1);
-    labelList nPatchFaces(1000, 0);
-    labelList origRegion(1000, 0);
+    labelList mapToFoamPatchId(1000, label(-1));
+    labelList nPatchFaces(1000, label(0));
+    labelList origRegion(1000, label(0));
     patchTypes_.setSize(1000);
 
     // this is what we seem to need
diff --git a/src/conversion/meshTables/cellTable.H b/src/conversion/meshTables/cellTable.H
index 429ffccbd..c356d5e02 100644
--- a/src/conversion/meshTables/cellTable.H
+++ b/src/conversion/meshTables/cellTable.H
@@ -90,7 +90,7 @@ class cellTable
         Map<label> zoneMap() const;
 
         //- A contiguous list of cellTable names
-        List<word> namesList() const;
+        wordList namesList() const;
 
         //- Add required entries - MaterialType
         void addDefaults();
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 4b8aca8bd..084704a70 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -293,7 +293,7 @@ void Foam::meshWriters::STARCD::writeCells(const fileName& prefix) const
             const labelList& cFaces  = cells[cellId];
 
             // create (beg,end) indices
-            List<label> indices(cFaces.size() + 1);
+            labelList indices(cFaces.size() + 1);
             indices[0] = indices.size();
 
             label count = indices.size();
diff --git a/src/dbns/multigrid/mgMeshLevel/mgMeshLevel.C b/src/dbns/multigrid/mgMeshLevel/mgMeshLevel.C
index 46722e67f..9cee95ed6 100644
--- a/src/dbns/multigrid/mgMeshLevel/mgMeshLevel.C
+++ b/src/dbns/multigrid/mgMeshLevel/mgMeshLevel.C
@@ -154,7 +154,7 @@ void Foam::mgMeshLevel::makeChild() const
     );
 
     // MGridGen agglomeration options.
-    List<int> options(4, 0);
+    List<int> options(4);
     options[0] = 4;                   // globular agglom
     options[1] = 6;                   // objective F3 and F2
     options[2] = 128;                 // debugging output level
diff --git a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
index d49007c72..dfcaa98ee 100644
--- a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -46,8 +46,8 @@ namespace Foam
 void Foam::decompositionMethod::calcCSR
 (
     const labelListList& cellCells,
-    List<int>& adjncy,
-    List<int>& xadj
+    labelList& adjncy,
+    labelList& xadj
 )
 {
     // Count number of internal faces
@@ -88,8 +88,8 @@ void Foam::decompositionMethod::calcCSR
 void Foam::decompositionMethod::calcCSR
 (
     const polyMesh& mesh,
-    List<int>& adjncy,
-    List<int>& xadj
+    labelList& adjncy,
+    labelList& xadj
 )
 {
     // Make Metis CSR (Compressed Storage Format) storage
@@ -185,8 +185,8 @@ void Foam::decompositionMethod::calcCSR
 void Foam::decompositionMethod::calcDistributedCSR
 (
     const polyMesh& mesh,
-    List<int>& adjncy,
-    List<int>& xadj
+    labelList& adjncy,
+    labelList& xadj
 )
 {
     // Create global cell numbers
@@ -210,7 +210,7 @@ void Foam::decompositionMethod::calcDistributedCSR
     // Get renumbered owner on other side of coupled faces
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    List<int> globalNeighbour(mesh.nFaces()-mesh.nInternalFaces());
+    labelList globalNeighbour(mesh.nFaces()-mesh.nInternalFaces());
 
     forAll(patches, patchI)
     {
@@ -239,7 +239,7 @@ void Foam::decompositionMethod::calcDistributedCSR
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Number of faces per cell
-    List<int> nFacesPerCell(mesh.nCells(), 0);
+    labelList nFacesPerCell(mesh.nCells(), 0);
 
     // Number of coupled faces
     label nCoupledFaces = 0;
@@ -272,7 +272,7 @@ void Foam::decompositionMethod::calcDistributedCSR
 
     xadj.setSize(mesh.nCells() + 1);
 
-    int freeAdj = 0;
+    label freeAdj = 0;
 
     for (label cellI = 0; cellI < mesh.nCells(); cellI++)
     {
diff --git a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
index 9d7c5aeb0..2241ba55c 100644
--- a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
+++ b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
@@ -63,8 +63,8 @@ protected:
         static void calcCSR
         (
             const labelListList& globalCellCells,
-            List<int>& adjncy,
-            List<int>& xadj
+            labelList& adjncy,
+            labelList& xadj
         );
 
         //- Helper: convert local connectivity from the mesh
@@ -73,8 +73,8 @@ protected:
         static void calcCSR
         (
             const polyMesh& mesh,
-            List<int>& adjncy,
-            List<int>& xadj
+            labelList& adjncy,
+            labelList& xadj
         );
 
         //- Helper: convert mesh connectivity into distributed CSR
@@ -82,8 +82,8 @@ protected:
         static void calcDistributedCSR
         (
             const polyMesh&,
-            List<int>& adjncy,
-            List<int>& xadj
+            labelList& adjncy,
+            labelList& xadj
         );
 
         //- Helper: determine (non-parallel) cellCells from mesh
diff --git a/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index c99be4e5b..0d971e9be 100644
--- a/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -97,7 +97,7 @@ void Foam::hierarchGeomDecomp::setDecompOrder()
 
 Foam::label Foam::hierarchGeomDecomp::findLower
 (
-    const List<scalar>& l,
+    const scalarList& l,
     const scalar t,
     const label initLow,
     const label initHigh
@@ -179,7 +179,7 @@ void Foam::hierarchGeomDecomp::calculateSortedWeightedSizes
 void Foam::hierarchGeomDecomp::findBinary
 (
     const label sizeTol,
-    const List<scalar>& values,
+    const scalarList& values,
     const label minIndex,       // index of previous value
     const scalar minValue,      // value at minIndex
     const scalar maxValue,      // global max of values
@@ -253,8 +253,8 @@ void Foam::hierarchGeomDecomp::findBinary
 void Foam::hierarchGeomDecomp::findBinary
 (
     const label sizeTol,
-    const List<scalar>& sortedWeightedSizes,
-    const List<scalar>& values,
+    const scalarList& sortedWeightedSizes,
+    const scalarList& values,
     const label minIndex,       // index of previous value
     const scalar minValue,      // value at minIndex
     const scalar maxValue,      // global max of values
diff --git a/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
index 62f7e12f6..00093e0d4 100644
--- a/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
+++ b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
@@ -100,7 +100,7 @@ class hierarchGeomDecomp
         //- Find index of t in list inbetween indices left and right
         static label findLower
         (
-            const List<scalar>&,
+            const scalarList&,
             const scalar t,
             const label left,
             const label right
@@ -112,7 +112,7 @@ class hierarchGeomDecomp
         static void findBinary
         (
             const label sizeTol,        // Acceptable size difference
-            const List<scalar>&,
+            const scalarList&,
             const label leftIndex,      // index of previous value
             const scalar leftValue,     // value at leftIndex
             const scalar maxValue,      // global max of values
@@ -127,8 +127,8 @@ class hierarchGeomDecomp
         static void findBinary
         (
             const label sizeTol,        // Acceptable size difference
-            const List<scalar>& sortedWeightedSizes,
-            const List<scalar>&,
+            const scalarList& sortedWeightedSizes,
+            const scalarList&,
             const label leftIndex,      // index of previous value
             const scalar leftValue,     // value at leftIndex
             const scalar maxValue,      // global max of values
diff --git a/src/decompositionMethods/metisDecomp/metisDecomp.C b/src/decompositionMethods/metisDecomp/metisDecomp.C
index caad36a32..619de7668 100644
--- a/src/decompositionMethods/metisDecomp/metisDecomp.C
+++ b/src/decompositionMethods/metisDecomp/metisDecomp.C
@@ -54,10 +54,10 @@ namespace Foam
 
 Foam::label Foam::metisDecomp::decompose
 (
-    const List<int>& adjncy,
-    const List<int>& xadj,
+    const labelList& adjncy,
+    const labelList& xadj,
     const scalarField& cWeights,
-    List<int>& finalDecomp
+    labelList& finalDecomp
 )
 {
     // Method of decomposition
@@ -65,7 +65,7 @@ Foam::label Foam::metisDecomp::decompose
     // k-way: multi-level k-way
     word method("k-way");
 
-    int numCells = xadj.size()-1;
+    label numCells = xadj.size()-1;
 
     // decomposition options. 0 = use defaults
     idx_t options[METIS_NOPTIONS];
@@ -76,10 +76,10 @@ Foam::label Foam::metisDecomp::decompose
     Field<real_t> processorWeights;
 
     // cell weights (so on the vertices of the dual)
-    List<int> cellWeights;
+    labelList cellWeights;
 
     // face weights (so on the edges of the dual)
-    List<int> faceWeights;
+    labelList faceWeights;
 
 
     // Check for externally provided cellweights and if so initialise weights
@@ -177,7 +177,7 @@ Foam::label Foam::metisDecomp::decompose
         {
             Info<< "metisDecomp : Using cell-based weights." << endl;
 
-            IOList<int> cellIOWeights
+            IOList<label> cellIOWeights
             (
                 IOobject
                 (
@@ -200,17 +200,17 @@ Foam::label Foam::metisDecomp::decompose
         }
     }
 
-    int nProcs = nProcessors_;
+    label nProcs = nProcessors_;
 
     // output: cell -> processor addressing
     finalDecomp.setSize(numCells);
 
     // output: number of cut edges
-    int edgeCut = 0;
+    label edgeCut = 0;
 
     // Vertex weight info
-    int* vwgtPtr = nullptr;
-    int* adjwgtPtr = nullptr;
+    label* vwgtPtr = nullptr;
+    label* adjwgtPtr = nullptr;
 
     if (cellWeights.size())
     {
@@ -221,7 +221,7 @@ Foam::label Foam::metisDecomp::decompose
         adjwgtPtr = faceWeights.begin();
     }
 
-    int one = 1;
+    label one = 1;
 
     if (method == "recursive")
     {
@@ -229,8 +229,8 @@ Foam::label Foam::metisDecomp::decompose
         (
             &numCells,         // num vertices in graph
             &one,
-            const_cast<List<int>&>(xadj).begin(),   // indexing into adjncy
-            const_cast<List<int>&>(adjncy).begin(), // neighbour info
+            const_cast<List<label>&>(xadj).begin(),   // indexing into adjncy
+            const_cast<List<label>&>(adjncy).begin(), // neighbour info
             vwgtPtr,           // vertexweights
             nullptr,
             adjwgtPtr,         // no edgeweights
@@ -248,8 +248,8 @@ Foam::label Foam::metisDecomp::decompose
         (
             &numCells,         // num vertices in graph
             &one,
-            const_cast<List<int>&>(xadj).begin(),   // indexing into adjncy
-            const_cast<List<int>&>(adjncy).begin(), // neighbour info
+            const_cast<List<label>&>(xadj).begin(),   // indexing into adjncy
+            const_cast<List<label>&>(adjncy).begin(), // neighbour info
             vwgtPtr,           // vertexweights
             nullptr,
             adjwgtPtr,         // no edgeweights
@@ -300,8 +300,8 @@ Foam::labelList Foam::metisDecomp::decompose
             << exit(FatalError);
     }
 
-    List<int> adjncy;
-    List<int> xadj;
+    labelList adjncy;
+    labelList xadj;
     calcCSR
     (
         mesh_,
@@ -310,7 +310,7 @@ Foam::labelList Foam::metisDecomp::decompose
     );
 
     // Decompose using default weights
-    List<int> finalDecomp;
+    labelList finalDecomp;
     decompose(adjncy, xadj, pointWeights, finalDecomp);
 
     // Copy back to labelList
@@ -348,8 +348,8 @@ Foam::labelList Foam::metisDecomp::decompose
     // Make Metis CSR (Compressed Storage Format) storage
     //   adjncy      : contains neighbours (= edges in graph)
     //   xadj(celli) : start of information in adjncy for celli
-    List<int> adjncy;
-    List<int> xadj;
+    labelList adjncy;
+    labelList xadj;
     {
         // Get cellCells on coarse mesh.
         labelListList cellCells;
@@ -365,7 +365,7 @@ Foam::labelList Foam::metisDecomp::decompose
     }
 
     // Decompose using default weights
-    List<int> finalDecomp;
+    labelList finalDecomp;
     decompose(adjncy, xadj, coarseWeights, finalDecomp);
 
 
@@ -406,12 +406,12 @@ Foam::labelList Foam::metisDecomp::decompose
     //   adjncy      : contains neighbours (= edges in graph)
     //   xadj(celli) : start of information in adjncy for celli
 
-    List<int> adjncy;
-    List<int> xadj;
+    labelList adjncy;
+    labelList xadj;
     calcCSR(globalCellCells, adjncy, xadj);
 
     // Decompose using default weights
-    List<int> finalDecomp;
+    labelList finalDecomp;
     decompose(adjncy, xadj, cWeights, finalDecomp);
 
     // Copy back to labelList
diff --git a/src/decompositionMethods/metisDecomp/metisDecomp.H b/src/decompositionMethods/metisDecomp/metisDecomp.H
index 40e754490..82f64459c 100644
--- a/src/decompositionMethods/metisDecomp/metisDecomp.H
+++ b/src/decompositionMethods/metisDecomp/metisDecomp.H
@@ -63,10 +63,10 @@ class metisDecomp
 
         label decompose
         (
-            const List<int>& adjncy,
-            const List<int>& xadj,
+            const labelList& adjncy,
+            const labelList& xadj,
             const scalarField& cellWeights,
-            List<int>& finalDecomp
+            labelList& finalDecomp
         );
 
 
diff --git a/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
index 5984d791a..e607816ae 100644
--- a/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
+++ b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
@@ -59,20 +59,20 @@ namespace Foam
 //- Does prevention of 0 cell domains and calls parmetis.
 Foam::label Foam::parMetisDecomp::decompose
 (
-    Field<int>& xadj,
-    Field<int>& adjncy,
+    Field<label>& xadj,
+    Field<label>& adjncy,
     const pointField& cellCentres,
-    Field<int>& cellWeights,
-    Field<int>& faceWeights,
-    const List<int>& options,
-    List<int>& finalDecomp
+    Field<label>& cellWeights,
+    Field<label>& faceWeights,
+    const labelList& options,
+    labelList& finalDecomp
 )
 {
     // C style numbering
-    int numFlag = 0;
+    label numFlag = 0;
 
     // Number of dimensions
-    int nDims = 3;
+    label nDims = 3;
 
 
     if (cellCentres.size() != xadj.size()-1)
@@ -85,14 +85,14 @@ Foam::label Foam::parMetisDecomp::decompose
 
 
     // Get number of cells on all processors
-    List<int> nLocalCells(Pstream::nProcs());
+    labelList nLocalCells(Pstream::nProcs());
     nLocalCells[Pstream::myProcNo()] = xadj.size()-1;
     Pstream::gatherList(nLocalCells);
     Pstream::scatterList(nLocalCells);
 
     // Get cell offsets.
-    List<int> cellOffsets(Pstream::nProcs()+1);
-    int nGlobalCells = 0;
+    labelList cellOffsets(Pstream::nProcs()+1);
+    label nGlobalCells = 0;
     forAll(nLocalCells, procI)
     {
         cellOffsets[procI] = nGlobalCells;
@@ -102,7 +102,7 @@ Foam::label Foam::parMetisDecomp::decompose
 
     // Convert pointField into the data type parMetis expects (float or double)
     Field<real_t> xyz(3*cellCentres.size());
-    int compI = 0;
+    label compI = 0;
     forAll(cellCentres, cellI)
     {
         const point& cc = cellCentres[cellI];
@@ -120,7 +120,7 @@ Foam::label Foam::parMetisDecomp::decompose
 
     // Number of cells to send to the next processor
     // (is same as number of cells next processor has to receive)
-    List<int> nSendCells(Pstream::nProcs(), 0);
+    labelList nSendCells(Pstream::nProcs(), 0);
 
     for (label procI = nLocalCells.size()-1; procI >=1; procI--)
     {
@@ -137,11 +137,11 @@ Foam::label Foam::parMetisDecomp::decompose
         // Receive cells from previous processor
         IPstream fromPrevProc(Pstream::blocking, Pstream::myProcNo()-1);
 
-        Field<int> prevXadj(fromPrevProc);
-        Field<int> prevAdjncy(fromPrevProc);
+        Field<label> prevXadj(fromPrevProc);
+        Field<label> prevAdjncy(fromPrevProc);
         Field<real_t> prevXyz(fromPrevProc);
-        Field<int> prevCellWeights(fromPrevProc);
-        Field<int> prevFaceWeights(fromPrevProc);
+        Field<label> prevCellWeights(fromPrevProc);
+        Field<label> prevFaceWeights(fromPrevProc);
 
         if (prevXadj.size() != nSendCells[Pstream::myProcNo()-1])
         {
@@ -172,34 +172,34 @@ Foam::label Foam::parMetisDecomp::decompose
         // Send cells to next processor
         OPstream toNextProc(Pstream::blocking, Pstream::myProcNo()+1);
 
-        int nCells = nSendCells[Pstream::myProcNo()];
-        int startCell = xadj.size()-1 - nCells;
-        int startFace = xadj[startCell];
-        int nFaces = adjncy.size()-startFace;
+        label nCells = nSendCells[Pstream::myProcNo()];
+        label startCell = xadj.size()-1 - nCells;
+        label startFace = xadj[startCell];
+        label nFaces = adjncy.size()-startFace;
 
         // Send for all cell data: last nCells elements
         // Send for all face data: last nFaces elements
         toNextProc
-            << Field<int>::subField(xadj, nCells, startCell)-startFace
-            << Field<int>::subField(adjncy, nFaces, startFace)
+            << Field<label>::subField(xadj, nCells, startCell)-startFace
+            << Field<label>::subField(adjncy, nFaces, startFace)
             << SubField<real_t>(xyz, nDims*nCells, nDims*startCell)
             <<
             (
                 cellWeights.size()
-              ? static_cast<const Field<int>&>
+              ? static_cast<const Field<label>&>
                 (
-                    Field<int>::subField(cellWeights, nCells, startCell)
+                    Field<label>::subField(cellWeights, nCells, startCell)
                 )
-              : Field<int>(0)
+              : Field<label>(0)
             )
             <<
             (
                 faceWeights.size()
-              ? static_cast<const Field<int>&>
+              ? static_cast<const Field<label>&>
                 (
-                    Field<int>::subField(faceWeights, nFaces, startFace)
+                    Field<label>::subField(faceWeights, nFaces, startFace)
                 )
-              : Field<int>(0)
+              : Field<label>(0)
             );
 
         // Remove data that has been sent
@@ -248,9 +248,9 @@ Foam::label Foam::parMetisDecomp::decompose
     }
 
     // Weight info
-    int wgtFlag = 0;
-    int* vwgtPtr = nullptr;
-    int* adjwgtPtr = nullptr;
+    label wgtFlag = 0;
+    label* vwgtPtr = nullptr;
+    label* adjwgtPtr = nullptr;
 
     if (cellWeights.size())
     {
@@ -265,7 +265,7 @@ Foam::label Foam::parMetisDecomp::decompose
 
 
     // Number of weights or balance constraints
-    int nCon = 1;
+    label nCon = 1;
     // Per processor, per constraint the weight
     Field<real_t> tpwgts(nCon*nProcessors_, 1./nProcessors_);
     // Imbalance tolerance
@@ -282,8 +282,10 @@ Foam::label Foam::parMetisDecomp::decompose
     finalDecomp.setSize(nLocalCells[Pstream::myProcNo()]);
 
     // output: number of cut edges
-    int edgeCut = 0;
+    label edgeCut = 0;
 
+    // Number of parts
+    label nProcs = nProcessors_;
 
     ParMETIS_V3_PartGeomKway
     (
@@ -297,10 +299,10 @@ Foam::label Foam::parMetisDecomp::decompose
         &nDims,
         xyz.begin(),
         &nCon,
-        &nProcessors_,          // nParts
+        &nProcs,                // nParts
         tpwgts.begin(),
         ubvec.begin(),
-        const_cast<List<int>&>(options).begin(),
+        const_cast<List<label>&>(options).begin(),
         &edgeCut,
         finalDecomp.begin(),
         &comm
@@ -315,7 +317,7 @@ Foam::label Foam::parMetisDecomp::decompose
     {
         IPstream fromNextProc(Pstream::blocking, Pstream::myProcNo()+1);
 
-        List<int> nextFinalDecomp(fromNextProc);
+        labelList nextFinalDecomp(fromNextProc);
 
         if (nextFinalDecomp.size() != nSendCells[Pstream::myProcNo()])
         {
@@ -334,10 +336,10 @@ Foam::label Foam::parMetisDecomp::decompose
     {
         OPstream toPrevProc(Pstream::blocking, Pstream::myProcNo()-1);
 
-        int nToPrevious = nSendCells[Pstream::myProcNo()-1];
+        label nToPrevious = nSendCells[Pstream::myProcNo()-1];
 
         toPrevProc <<
-            SubList<int>
+            SubList<label>
             (
                 finalDecomp,
                 nToPrevious,
@@ -399,9 +401,9 @@ Foam::labelList Foam::parMetisDecomp::decompose
 
 
     // Connections
-    Field<int> adjncy;
+    Field<label> adjncy;
     // Offsets into adjncy
-    Field<int> xadj;
+    Field<label> xadj;
     calcDistributedCSR
     (
         mesh_,
@@ -411,16 +413,16 @@ Foam::labelList Foam::parMetisDecomp::decompose
 
 
     // decomposition options. 0 = use defaults
-    List<int> options(3, 0);
+    labelList options(3, label(0));
     //options[0] = 1;     // don't use defaults but use values below
     //options[1] = -1;    // full debug info
     //options[2] = 15;    // random number seed
 
     // cell weights (so on the vertices of the dual)
-    Field<int> cellWeights;
+    Field<label> cellWeights;
 
     // face weights (so on the edges of the dual)
-    Field<int> faceWeights;
+    Field<label> faceWeights;
 
 
     // Check for externally provided cellweights and if so initialise weights
@@ -527,7 +529,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
             faceWeights.setSize(adjncy.size());
 
             // Assume symmetric weights. Keep same ordering as adjncy.
-            List<int> nFacesPerCell(mesh_.nCells(), 0);
+            labelList nFacesPerCell(mesh_.nCells(), 0);
 
             // Handle internal faces
             for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
@@ -581,7 +583,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
 
 
     // Do actual decomposition
-    List<int> finalDecomp;
+    labelList finalDecomp;
     decompose
     (
         xadj,
@@ -636,7 +638,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
     // Get renumbered owner region on other side of coupled faces
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    List<int> globalNeighbour(mesh_.nFaces()-mesh_.nInternalFaces());
+    labelList globalNeighbour(mesh_.nFaces()-mesh_.nInternalFaces());
 
     forAll(patches, patchI)
     {
@@ -781,24 +783,24 @@ Foam::labelList Foam::parMetisDecomp::decompose
     // Make Metis Distributed CSR (Compressed Storage Format) storage
 
     // Connections
-    Field<int> adjncy;
+    Field<label> adjncy;
 
     // Offsets into adjncy
-    Field<int> xadj;
+    Field<label> xadj;
 
     calcCSR(globalCellCells, adjncy, xadj);
 
     // decomposition options. 0 = use defaults
-    List<int> options(3, 0);
+    labelList options(3, label(0));
     //options[0] = 1;     // don't use defaults but use values below
     //options[1] = -1;    // full debug info
     //options[2] = 15;    // random number seed
 
     // cell weights (so on the vertices of the dual)
-    Field<int> cellWeights;
+    Field<label> cellWeights;
 
     // face weights (so on the edges of the dual)
-    Field<int> faceWeights;
+    Field<label> faceWeights;
 
 
     // Check for externally provided cellweights and if so initialise weights
@@ -860,7 +862,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
 
 
     // Do actual decomposition
-    List<int> finalDecomp;
+    labelList finalDecomp;
     decompose
     (
         xadj,
diff --git a/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
index 5ba90411b..fdca1e0ce 100644
--- a/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
+++ b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
@@ -72,14 +72,14 @@ class parMetisDecomp
 
         label decompose
         (
-            Field<int>& xadj,
-            Field<int>& adjncy,
+            Field<label>& xadj,
+            Field<label>& adjncy,
             const pointField& cellCentres,
-            Field<int>& cellWeights,
-            Field<int>& faceWeights,
-            const List<int>& options,
+            Field<label>& cellWeights,
+            Field<label>& faceWeights,
+            const labelList& options,
 
-            List<int>& finalDecomp
+            labelList& finalDecomp
         );
 
 
diff --git a/src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.C b/src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.C
index 50a2b15cd..4ebad984c 100644
--- a/src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.C
+++ b/src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.C
@@ -164,11 +164,11 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
 // Call scotch with options from dictionary.
 Foam::label Foam::scotchDecomp::decompose
 (
-    const List<int>& adjncy,
-    const List<int>& xadj,
+    const labelList& adjncy,
+    const labelList& xadj,
     const scalarField& cWeights,
 
-    List<int>& finalDecomp
+    labelList& finalDecomp
 )
 {
     // Dump graph
@@ -247,7 +247,7 @@ Foam::label Foam::scotchDecomp::decompose
     // Graph
     // ~~~~~
 
-    List<int> velotab;
+    labelList velotab;
 
 
     // Check for externally provided cellweights and if so initialise weights
@@ -314,7 +314,7 @@ Foam::label Foam::scotchDecomp::decompose
     SCOTCH_Arch archdat;
     check(SCOTCH_archInit(&archdat), "SCOTCH_archInit");
 
-    List<label> processorWeights;
+    labelList processorWeights;
     if (decompositionDict_.found("scotchCoeffs"))
     {
         const dictionary& scotchCoeffs =
@@ -443,12 +443,12 @@ Foam::labelList Foam::scotchDecomp::decompose
     // Make Metis CSR (Compressed Storage Format) storage
     //   adjncy      : contains neighbours (= edges in graph)
     //   xadj(celli) : start of information in adjncy for celli
-    List<int> adjncy;
-    List<int> xadj;
+    labelList adjncy;
+    labelList xadj;
     calcCSR(mesh_, adjncy, xadj);
 
     // Decompose using default weights
-    List<int> finalDecomp;
+    labelList finalDecomp;
     decompose(adjncy, xadj, pointWeights, finalDecomp);
 
     // Copy back to labelList
@@ -485,8 +485,8 @@ Foam::labelList Foam::scotchDecomp::decompose
     // Make Metis CSR (Compressed Storage Format) storage
     //   adjncy      : contains neighbours (= edges in graph)
     //   xadj(celli) : start of information in adjncy for celli
-    List<int> adjncy;
-    List<int> xadj;
+    labelList adjncy;
+    labelList xadj;
     {
         // Get cellCells on coarse mesh.
         labelListList cellCells;
@@ -503,7 +503,7 @@ Foam::labelList Foam::scotchDecomp::decompose
     }
 
     // Decompose using weights
-    List<int> finalDecomp;
+    labelList finalDecomp;
     decompose(adjncy, xadj, coarseWeights, finalDecomp);
 
     // Rework back into decomposition for original mesh_
@@ -543,12 +543,12 @@ Foam::labelList Foam::scotchDecomp::decompose
     //   adjncy      : contains neighbours (= edges in graph)
     //   xadj(celli) : start of information in adjncy for celli
 
-    List<int> adjncy;
-    List<int> xadj;
+    labelList adjncy;
+    labelList xadj;
     calcCSR(globalCellCells, adjncy, xadj);
 
     // Decompose using weights
-    List<int> finalDecomp;
+    labelList finalDecomp;
     decompose(adjncy, xadj, cWeights, finalDecomp);
 
     // Copy back to labelList
diff --git a/src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.H b/src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.H
index d9879faff..3caf6d421 100644
--- a/src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.H
+++ b/src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.H
@@ -68,10 +68,10 @@ class scotchDecomp
 
         label decompose
         (
-            const List<int>& adjncy,
-            const List<int>& xadj,
+            const labelList& adjncy,
+            const labelList& xadj,
             const scalarField& cWeights,
-            List<int>& finalDecomp
+            labelList& finalDecomp
         );
 
 
diff --git a/src/dynamicMesh/dynamicFvMesh/fvMeshDistribute/CompactListList_dev.H b/src/dynamicMesh/dynamicFvMesh/fvMeshDistribute/CompactListList_dev.H
index 277d46498..565ed59a0 100644
--- a/src/dynamicMesh/dynamicFvMesh/fvMeshDistribute/CompactListList_dev.H
+++ b/src/dynamicMesh/dynamicFvMesh/fvMeshDistribute/CompactListList_dev.H
@@ -84,7 +84,7 @@ class CompactListList_dev
         label size_;
 
         //- Offset table
-        List<label> offsets_;
+        labelList offsets_;
 
         //- Packed matrix of data
         List<T> m_;
@@ -143,10 +143,10 @@ public:
             inline bool empty() const;
 
             //- Return the offset table (= size()+1)
-            inline const List<label>& offsets() const;
+            inline const labelList& offsets() const;
 
             //- Return non-const access to the offset table
-            inline List<label>& offsets();
+            inline labelList& offsets();
 
             //- Return the packed matrix of data
             inline const List<T>& m() const;
diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directActions/addPatchCellLayer.C b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directActions/addPatchCellLayer.C
index 5111f5a5f..62559fb9c 100644
--- a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directActions/addPatchCellLayer.C
+++ b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directActions/addPatchCellLayer.C
@@ -630,7 +630,14 @@ void Foam::addPatchCellLayer::setRefinement
         {
             labelList n(mesh_.nPoints(), 0);
             IndirectList<label>(n, meshPoints) = nPointLayers;
-            syncTools::syncPointList(mesh_, n, maxEqOp<label>(), 0, false);
+            syncTools::syncPointList
+            (
+                mesh_,
+                n,
+                maxEqOp<label>(),
+                label(0),
+                false
+            );
 
             // Non-synced
             forAll(meshPoints, i)
@@ -674,7 +681,7 @@ void Foam::addPatchCellLayer::setRefinement
                 mesh_,
                 nFromFace,
                 maxEqOp<label>(),
-                0,
+                label(0),
                 false
             );
 
@@ -1116,7 +1123,7 @@ void Foam::addPatchCellLayer::setRefinement
             mesh_,
             meshEdgeLayers,
             maxEqOp<label>(),
-            0,                  // initial value
+            label(0),           // initial value
             false               // no separation
         );
 
diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directActions/combineFaces.C b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directActions/combineFaces.C
index 6376b7044..6f1e35132 100644
--- a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directActions/combineFaces.C
+++ b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directActions/combineFaces.C
@@ -707,7 +707,7 @@ void Foam::combineFaces::setRefinement
         mesh_,
         nPointFaces,
         plusEqOp<label>(),
-        0,                  // null value
+        label(0),           // null value
         false               // no separation
     );
 
diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
index c6d316d0e..9ca5679cf 100644
--- a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
+++ b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
@@ -1379,7 +1379,7 @@ void Foam::directTopoChange::calcCellInflationMaps
     {
         label nCellsFromFaces = 0;
 
-        labelList cellsAroundFace(2, -1);
+        labelList cellsAroundFace(2, label(-1));
 
         // Collect all still existing faces connected to this point.
         forAllConstIter(Map<label>, cellFromFace_, iter)
diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.C b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.C
index 6a14769c4..69c5a9fdd 100644
--- a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.C
+++ b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.C
@@ -68,7 +68,7 @@ bool Foam::wallLayerCells::usesCoupledPatch(const label cellI) const
 Foam::wallLayerCells::wallLayerCells
 (
     const polyMesh& mesh,
-    const List<word>& patchNames,
+    const wordList& patchNames,
     const label nLayers
 )
 :
diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.H b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.H
index b6dd42725..47f5a1d16 100644
--- a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.H
+++ b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.H
@@ -72,7 +72,7 @@ public:
         wallLayerCells
         (
             const polyMesh& mesh,
-            const List<word>& patchNames,
+            const wordList& patchNames,
             const label nLayers
         );
 };
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.C
index f627b7f55..203263431 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.C
@@ -124,7 +124,7 @@ void Foam::prismatic2DRefinement::appendFaceSplitInfo
     const label& faceI,
     const boolList& edgeOnPatchToCut,
     const labelList& edgeMidPoint,
-    DynamicList<label>& splitFacesIntoTwo,
+    dynamicLabelList& splitFacesIntoTwo,
     DynamicList<Pair<label> >& splitFacesEmptyEdges
 ) const
 {
@@ -889,7 +889,7 @@ void Foam::prismatic2DRefinement::setRefinementInstruction
 
     // Allocate enough storage to prevent excessive resizing
     const label nSplitFacesIntoTwo = 3*cellsToRefine_.size();
-    DynamicList<label> splitFacesIntoTwo(nSplitFacesIntoTwo);
+    dynamicLabelList splitFacesIntoTwo(nSplitFacesIntoTwo);
     DynamicList<Pair<label> > splitFacesEmptyEdges(nSplitFacesIntoTwo);
 
     // Get necessary mesh data
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.H b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.H
index 5e27c1d49..876ff1ebe 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.H
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.H
@@ -99,7 +99,7 @@ private:
                 const label& faceI,
                 const boolList& edgeOnEmptyPatch,
                 const labelList& edgeMidPoint,
-                DynamicList<label>& splitFacesIntoTwo,
+                dynamicLabelList& splitFacesIntoTwo,
                 DynamicList<Pair<label> >& splitFacesEmptyEdges
             ) const;
 
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/refinement/refinement.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/refinement/refinement.C
index 64a8a10b3..9e156aa87 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/refinement/refinement.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/refinement/refinement.C
@@ -1442,7 +1442,7 @@ void Foam::refinement::setRefinement(polyTopoChange& ref) const
         mesh_,
         pointLevel_,
         maxEqOp<label>(),
-        0,   // Null value
+        label(0), // Null value
         true // Apply separation for parallel cyclics
     );
 
diff --git a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
index 8b89f320b..325845f55 100644
--- a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
+++ b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C
@@ -1671,7 +1671,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChanger::changeMesh
                 }
             }
 
-            labelList cellsAroundFace(2, -1);
+            labelList cellsAroundFace(2, label(-1));
 
             cellsAroundFace[0] = mesh.faceOwner()[ac[acI].masterFaceID()];
 
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/cellSetAlgorithm.C b/src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/cellSetAlgorithm.C
index c1dfd74c8..129957a03 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/cellSetAlgorithm.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/cellSetAlgorithm.C
@@ -459,7 +459,7 @@ void cellSetAlgorithm::writeVTK
         List<edge>(0),
         List<face>(0),
         allTets,
-        List<label>(0)
+        labelList(0)
     );
 }
 
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/faceSetAlgorithm.C b/src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/faceSetAlgorithm.C
index 7cd79f1fe..f5638d065 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/faceSetAlgorithm.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/faceSetAlgorithm.C
@@ -403,7 +403,7 @@ void faceSetAlgorithm::writeVTK
         List<edge>(0),
         allTris,
         List<cell>(0),
-        List<label>(0)
+        labelList(0)
     );
 }
 
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/coupledMesh/dynamicTopoFvMeshCoupled.C b/src/dynamicMesh/dynamicTopoFvMesh/coupledMesh/dynamicTopoFvMeshCoupled.C
index 1598a63a6..c3c158427 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/coupledMesh/dynamicTopoFvMeshCoupled.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/coupledMesh/dynamicTopoFvMeshCoupled.C
@@ -2406,7 +2406,7 @@ const changeMap dynamicTopoFvMesh::insertCells(const label mIndex)
                                 (
                                     pointJ,
                                     meshJ.oldPoints_[pItJ.key()],
-                                    labelList(1, -1)
+                                    labelList(1, label(-1))
                                 )
                             );
 
@@ -2500,7 +2500,7 @@ const changeMap dynamicTopoFvMesh::insertCells(const label mIndex)
                 (
                     pointI,
                     meshI.oldPoints_[pItI.key()],
-                    labelList(1, -1)
+                    labelList(1, label(-1))
                 )
             );
 
@@ -3053,7 +3053,7 @@ const changeMap dynamicTopoFvMesh::insertCells(const label mIndex)
                 //  - Set an invalid number so that
                 //    an entry is made in facesFromFaces,
                 //    while faceParents is empty.
-                setFaceMapping(fI(), labelList(1, -1));
+                setFaceMapping(fI(), labelList(1, label(-1)));
             }
             else
             {
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMeshMapping.C b/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMeshMapping.C
index 20536efb0..633ca598d 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMeshMapping.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMeshMapping.C
@@ -91,7 +91,7 @@ void dynamicTopoFvMesh::computeMapping
         if (skipMapping)
         {
             // Dummy map from cell[0]
-            masterObjects = labelList(1, 0);
+            masterObjects = labelList(1, label(0));
             cellWeights_[cellI].setSize(1, 1.0);
             cellCentres_[cellI].setSize(1, vector::zero);
         }
@@ -248,7 +248,7 @@ void dynamicTopoFvMesh::computeMapping
         {
             // Set dummy masters, so that the conventional
             // faceMapper doesn't crash-and-burn
-            masterObjects = labelList(1, 0);
+            masterObjects = labelList(1, label(0));
 
             continue;
         }
@@ -256,7 +256,7 @@ void dynamicTopoFvMesh::computeMapping
         if (skipMapping)
         {
             // Dummy map from patch[0]
-            masterObjects = labelList(1, 0);
+            masterObjects = labelList(1, label(0));
             faceWeights_[faceI].setSize(1, 1.0);
             faceCentres_[faceI].setSize(1, vector::zero);
         }
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMeshReOrder.C b/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMeshReOrder.C
index 45a38027c..1f3ffe2fc 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMeshReOrder.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/dynamicTopoFvMeshReOrder.C
@@ -1901,7 +1901,7 @@ void dynamicTopoFvMesh::threadedMeshReOrdering
     reOrderPtr[3].set(0, &cellZoneMap);
 
     // Set the thread scheduling sequence
-    labelList reOrderSeq(4, -1);
+    labelList reOrderSeq(4, label(-1));
 
     // Points, cells, faces and edges (in that order)
     reOrderSeq[0] = 0;
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/edgeBisect.C b/src/dynamicMesh/dynamicTopoFvMesh/edgeBisect.C
index ce2dff4c8..3c783bf9e 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/edgeBisect.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/edgeBisect.C
@@ -110,7 +110,7 @@ const changeMap dynamicTopoFvMesh::bisectQuadFace
     bool found;
     label replaceFace = -1, retainFace = -1;
     face tmpQuadFace(4), tmpTriFace(3);
-    labelList tmpQFEdges(4, -1), tmpTFEdges(3, -1);
+    labelList tmpQFEdges(4, label(-1)), tmpTFEdges(3, label(-1));
     FixedList<label,7> newFaceIndex(-1), newEdgeIndex(-1);
     FixedList<edge,4> commonEdges(edge(-1, -1));
     FixedList<label,4> cornerEdgeIndex(-1), commonEdgeIndex(-1);
@@ -455,7 +455,7 @@ const changeMap dynamicTopoFvMesh::bisectQuadFace
 
         // Fill the masterMap with points that
         // we seek maps for...
-        FixedList<labelList, 2> slaveEdges(labelList(2, -1));
+        FixedList<labelList, 2> slaveEdges(labelList(2, label(-1)));
 
         forAll(slaveEdges, edgeI)
         {
@@ -597,7 +597,7 @@ const changeMap dynamicTopoFvMesh::bisectQuadFace
         // Write out VTK files prior to change
         if (debug > 3)
         {
-            labelList cellHull(2, -1);
+            labelList cellHull(2, label(-1));
 
             cellHull[0] = owner_[fIndex];
             cellHull[1] = neighbour_[fIndex];
@@ -632,7 +632,7 @@ const changeMap dynamicTopoFvMesh::bisectQuadFace
     otherEdgePoint[0] = commonEdges[0].otherVertex(nextToOtherPoint[0]);
     otherEdgePoint[1] = commonEdges[1].otherVertex(nextToOtherPoint[1]);
 
-    labelList mP(2, -1);
+    labelList mP(2, label(-1));
 
     // Set mapping for this point
     mP[0] = commonEdges[0][0];
@@ -1000,7 +1000,7 @@ const changeMap dynamicTopoFvMesh::bisectQuadFace
     );
 
     // Create / modify edges...
-    labelList tmpTriEdgeFaces(3, -1);
+    labelList tmpTriEdgeFaces(3, label(-1));
 
     // The edge bisecting the zeroth boundary triangular face
     tmpTriEdgeFaces[0] = c0BdyIndex[0];
@@ -1125,7 +1125,7 @@ const changeMap dynamicTopoFvMesh::bisectQuadFace
             newCells[0]
         );
 
-        labelList tmpBiEdgeFaces(2, -1);
+        labelList tmpBiEdgeFaces(2, label(-1));
 
         // The edge bisecting the face
         tmpTriEdgeFaces[0] = newFaceIndex[3];
@@ -1636,7 +1636,7 @@ const changeMap dynamicTopoFvMesh::bisectQuadFace
         );
 
         // Create / modify edges...
-        labelList tmpQuadEdgeFaces(4, -1);
+        labelList tmpQuadEdgeFaces(4, label(-1));
 
         // The internal edge bisecting the face
         tmpQuadEdgeFaces[0] = fIndex;
@@ -2197,7 +2197,7 @@ const changeMap dynamicTopoFvMesh::bisectQuadFace
     // Write out VTK files after change
     if (debug > 3)
     {
-        labelList cellHull(4, -1);
+        labelList cellHull(4, label(-1));
 
         cellHull[0] = owner_[fIndex];
         cellHull[1] = neighbour_[fIndex];
@@ -2838,9 +2838,9 @@ const changeMap dynamicTopoFvMesh::bisectEdge
     // Hull variables
     face tmpTriFace(3);
     edge origEdge(edges_[eIndex]);
-    labelList tmpEdgeFaces(3,-1);
-    labelList tmpIntEdgeFaces(4,-1);
-    labelList tmpFaceEdges(3,-1);
+    labelList tmpEdgeFaces(3, label(-1));
+    labelList tmpIntEdgeFaces(4, label(-1));
+    labelList tmpFaceEdges(3, label(-1));
 
     // Build vertexHull for this edge
     labelList vertexHull;
@@ -2848,9 +2848,9 @@ const changeMap dynamicTopoFvMesh::bisectEdge
 
     // Size up the hull lists
     label m = vertexHull.size();
-    labelList cellHull(m, -1);
-    labelList faceHull(m, -1);
-    labelList edgeHull(m, -1);
+    labelList cellHull(m, label(-1));
+    labelList faceHull(m, label(-1));
+    labelList edgeHull(m, label(-1));
     labelListList ringEntities(4, labelList(m, -1));
 
     // Construct a hull around this edge
@@ -2917,7 +2917,7 @@ const changeMap dynamicTopoFvMesh::bisectEdge
         }
     }
 
-    labelList mP(2, -1);
+    labelList mP(2, label(-1));
 
     // Set mapping for this point
     mP[0] = edges_[eIndex][0];
@@ -3108,7 +3108,7 @@ const changeMap dynamicTopoFvMesh::bisectEdge
                         tmpTriFace,
                         addedCellIndices[indexI],
                         -1,
-                        labelList(3, -1)
+                        labelList(3, label(-1))
                     )
                 );
 
@@ -3188,7 +3188,7 @@ const changeMap dynamicTopoFvMesh::bisectEdge
                         tmpTriFace,
                         addedCellIndices[prevI],
                         addedCellIndices[indexI],
-                        labelList(3, -1)
+                        labelList(3, label(-1))
                     )
                 );
 
@@ -3278,7 +3278,7 @@ const changeMap dynamicTopoFvMesh::bisectEdge
                         tmpTriFace,
                         addedCellIndices[0],
                         addedCellIndices[indexI],
-                        labelList(3, -1)
+                        labelList(3, label(-1))
                     )
                 );
 
@@ -3370,7 +3370,7 @@ const changeMap dynamicTopoFvMesh::bisectEdge
                     tmpTriFace,
                     addedCellIndices[prevI],
                     -1,
-                    labelList(3, -1)
+                    labelList(3, label(-1))
                 )
             );
 
@@ -4941,7 +4941,7 @@ const changeMap dynamicTopoFvMesh::addCellLayer
         addedCells.insert(cIndex, labelPair(newCellIndex, 0));
     }
 
-    labelList mP(2, -1);
+    labelList mP(2, label(-1));
 
     forAll(patchFaces, indexI)
     {
@@ -5211,7 +5211,7 @@ const changeMap dynamicTopoFvMesh::addCellLayer
             }
 
             // Configure faceEdges for the new vertical face
-            labelList newVFaceEdges(4, -1);
+            labelList newVFaceEdges(4, label(-1));
 
             newVFaceEdges[0] = beIndex;
             newVFaceEdges[1] = newHEdgeIndex;
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/edgeCollapse.C b/src/dynamicMesh/dynamicTopoFvMesh/edgeCollapse.C
index fb99e40dd..206fb2593 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/edgeCollapse.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/edgeCollapse.C
@@ -2471,7 +2471,7 @@ const changeMap dynamicTopoFvMesh::collapseQuadFace
     }
 
     // Ensure proper orientation for the two retained faces
-    FixedList<label,2> cellCheck(0);
+    FixedList<label,2> cellCheck(label(0));
 
     if (owner_[faceToThrow[0]] == c0)
     {
@@ -3142,7 +3142,7 @@ const changeMap dynamicTopoFvMesh::collapseQuadFace
     }
 
     // Fill-in candidate mapping information
-    labelList mC(2, -1);
+    labelList mC(2, label(-1));
     mC[0] = c0, mC[1] = c1;
 
     // Now that all old / new cells possess correct connectivity,
@@ -4781,7 +4781,10 @@ const changeMap dynamicTopoFvMesh::collapseEdge
 
     // Check whether points of the edge lies on a boundary
     const FixedList<bool,2> edgeBoundary = checkEdgeBoundary(eIndex);
-    FixedList<label, 2> nBoundCurves(0), nProcCurves(0), checkPoints(-1);
+    FixedList<label, 2>
+        nBoundCurves(label(0)),
+        nProcCurves(label(0)),
+        checkPoints(label(-1));
 
     // Decide on collapseCase
     label collapseCase = -1;
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/edgeSwap.C b/src/dynamicMesh/dynamicTopoFvMesh/edgeSwap.C
index 0132eb276..68b478533 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/edgeSwap.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/edgeSwap.C
@@ -717,7 +717,7 @@ const changeMap dynamicTopoFvMesh::swapQuadFace
         // Write out VTK files before change
         if (debug > 3)
         {
-            labelList cellHull(2, -1);
+            labelList cellHull(2, label(-1));
 
             cellHull[0] = c0;
             cellHull[1] = c1;
@@ -1041,7 +1041,7 @@ const changeMap dynamicTopoFvMesh::swapQuadFace
     edges_[commonEdgeIndex[1]] = newEdges[1];
 
     // Fill-in mapping information
-    labelList mC(2, -1);
+    labelList mC(2, label(-1));
     mC[0] = c0; mC[1] = c1;
 
     forAll(mC, cellI)
@@ -1056,7 +1056,7 @@ const changeMap dynamicTopoFvMesh::swapQuadFace
     // Write out VTK files after change
     if (debug > 3)
     {
-        labelList cellHull(2, -1);
+        labelList cellHull(2, label(-1));
 
         cellHull[0] = c0;
         cellHull[1] = c1;
@@ -3080,7 +3080,7 @@ const changeMap dynamicTopoFvMesh::swap32
             newTriFace,
             newCellIndex[0],
             newCellIndex[1],
-            labelList(3, -1)
+            labelList(3, label(-1))
         )
     );
 
@@ -3099,8 +3099,8 @@ const changeMap dynamicTopoFvMesh::swap32
 
     // For 2-2 swaps, two faces are introduced
     label nE = 0, nBf = 0;
-    FixedList<label,2> nBE(0);
-    FixedList<labelList,2> bdyFaceEdges(labelList(3, -1));
+    FixedList<label,2> nBE(label(0));
+    FixedList<labelList,2> bdyFaceEdges(labelList(3, label(-1)));
 
     // Fill-in information for the two new cells,
     // and correct info on existing neighbouring cells
@@ -3111,14 +3111,14 @@ const changeMap dynamicTopoFvMesh::swap32
     // For a 2-2 swap on a boundary edge,
     // add two boundary faces and an edge
     label newEdgeIndex = -1;
-    labelList oldBdyFaceIndex(2, -1), newBdyFaceIndex(2, -1);
+    labelList oldBdyFaceIndex(2, label(-1)), newBdyFaceIndex(2, label(-1));
 
     if (edgePatch > -1)
     {
         // Temporary local variables
         label facePatch = -1;
         edge newEdge(-1, -1);
-        FixedList<label,2> nBEdge(0);
+        FixedList<label,2> nBEdge(label(0));
         FixedList<FixedList<label,2>,2> bdyEdges;
         FixedList<face,2> newBdyTriFace(face(3));
 
@@ -3204,7 +3204,7 @@ const changeMap dynamicTopoFvMesh::swap32
                 newBdyTriFace[0],
                 newCellIndex[1],
                 -1,
-                labelList(3, -1)
+                labelList(3, label(-1))
             )
         );
 
@@ -3220,7 +3220,7 @@ const changeMap dynamicTopoFvMesh::swap32
                 newBdyTriFace[1],
                 newCellIndex[0],
                 -1,
-                labelList(3, -1)
+                labelList(3, label(-1))
             )
         );
 
@@ -3232,7 +3232,7 @@ const changeMap dynamicTopoFvMesh::swap32
         newTetCell[1][nF1++] = newBdyFaceIndex[0];
 
         // Add an edgeFaces entry
-        labelList newBdyEdgeFaces(3, -1);
+        labelList newBdyEdgeFaces(3, label(-1));
         newBdyEdgeFaces[0] = newBdyFaceIndex[0];
         newBdyEdgeFaces[1] = newFaceIndex;
         newBdyEdgeFaces[2] = newBdyFaceIndex[1];
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoPatchMapper.C b/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoPatchMapper.C
index ee958e8cb..2b78bc282 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoPatchMapper.C
+++ b/src/dynamicMesh/dynamicTopoFvMesh/fieldMapping/topoPatchMapper.C
@@ -362,7 +362,7 @@ void topoPatchMapper::calcAddressing() const
                 if (isA<processorPolyPatch>(patch_.patch()))
                 {
                     // Artificially map from face[0] of this patch.
-                    addr[faceI] = labelList(1, 0);
+                    addr[faceI] = labelList(1, label(0));
 
                     continue;
                 }
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/meshOps.H b/src/dynamicMesh/dynamicTopoFvMesh/meshOps.H
index 8752275a4..ab7be14fc 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/meshOps.H
+++ b/src/dynamicMesh/dynamicTopoFvMesh/meshOps.H
@@ -294,7 +294,7 @@ namespace meshOps
         const UList<edge>& edges = List<edge>(0),
         const UList<face>& faces = List<face>(0),
         const UList<cell>& cells = List<cell>(0),
-        const UList<label>& owner = List<label>(0),
+        const UList<label>& owner = labelList(0),
         const UList<scalar>& scalField = UList<scalar>(),
         const UList<label>& lablField = UList<label>(),
         const UList<vector>& vectField = UList<vector>()
diff --git a/src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C b/src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C
index e0cab222e..1b0dc8fbd 100644
--- a/src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C
+++ b/src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C
@@ -1248,7 +1248,7 @@ void mesquiteMotionSolver::initArrays()
     label nCellPoints = 0, nFacePoints = 0;
 
     // Construct shape recognizers
-    FixedList<label, 4> nTypes(0);
+    FixedList<label, 4> nTypes(label(0));
     FixedList<autoPtr<cellMatcher>, 4> matcher;
     FixedList<Mesquite::EntityTopology, 4> cellType;
 
@@ -2245,7 +2245,7 @@ void mesquiteMotionSolver::initParallelSurfaceSmoothing()
         (
             bufPoints,
             recvField,
-            List<scalar>(bufPoints.size(), tol),
+            scalarList(bufPoints.size(), tol),
             false,
             pointMap
         );
@@ -2513,7 +2513,7 @@ void mesquiteMotionSolver::initMesquiteParallelArrays()
         nSharedPoints[pI] = nProcPoints;
 
         // Initialize type sizes
-        FixedList<label, 4> nTypes(0);
+        FixedList<label, 4> nTypes(label(0));
 
         // Set an initial capacity for cell types
         myTypes[pI].setCapacity(50);
diff --git a/src/engine/engineTopoChangerMesh/accordionEngineMesh/movePistonPointsAccordionEngineMesh.H b/src/engine/engineTopoChangerMesh/accordionEngineMesh/movePistonPointsAccordionEngineMesh.H
index 14b8cc637..3f59a064f 100644
--- a/src/engine/engineTopoChangerMesh/accordionEngineMesh/movePistonPointsAccordionEngineMesh.H
+++ b/src/engine/engineTopoChangerMesh/accordionEngineMesh/movePistonPointsAccordionEngineMesh.H
@@ -15,8 +15,8 @@
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/deformingEngineMesh/movePistonPointsDeformingEngineMesh.H b/src/engine/engineTopoChangerMesh/deformingEngineMesh/movePistonPointsDeformingEngineMesh.H
index b63d79ff2..e82f350b2 100644
--- a/src/engine/engineTopoChangerMesh/deformingEngineMesh/movePistonPointsDeformingEngineMesh.H
+++ b/src/engine/engineTopoChangerMesh/deformingEngineMesh/movePistonPointsDeformingEngineMesh.H
@@ -14,8 +14,8 @@
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/engineValveSliding/moveValvePointsEngineValveSliding.H b/src/engine/engineTopoChangerMesh/engineValveSliding/moveValvePointsEngineValveSliding.H
index 00e38afdb..3d36509d4 100644
--- a/src/engine/engineTopoChangerMesh/engineValveSliding/moveValvePointsEngineValveSliding.H
+++ b/src/engine/engineTopoChangerMesh/engineValveSliding/moveValvePointsEngineValveSliding.H
@@ -29,7 +29,7 @@
              && valves_[valveI].isOpen()
             )
             {
-                List<bool> valveTopPoint(newPoints.size(), false);
+                boolList valveTopPoint(newPoints.size(), false);
 
 /*
                 label layeringVPtsIndex =
diff --git a/src/engine/engineTopoChangerMesh/layerAR/layerAR.C b/src/engine/engineTopoChangerMesh/layerAR/layerAR.C
index a739ae8da..209f1b745 100644
--- a/src/engine/engineTopoChangerMesh/layerAR/layerAR.C
+++ b/src/engine/engineTopoChangerMesh/layerAR/layerAR.C
@@ -296,8 +296,8 @@ bool Foam::layerAR::update()
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C b/src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C
index 6ddf6a42d..2dec5b493 100644
--- a/src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C
+++ b/src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C
@@ -290,8 +290,8 @@ bool Foam::layerARGambit::update()
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayerSmooth.H b/src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayerSmooth.H
index a201e7790..2a0bce520 100644
--- a/src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayerSmooth.H
+++ b/src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayerSmooth.H
@@ -15,8 +15,8 @@
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayeringLayerSmooth.H b/src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayeringLayerSmooth.H
index c3f0ea972..54deb7359 100644
--- a/src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayeringLayerSmooth.H
+++ b/src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayeringLayerSmooth.H
@@ -15,8 +15,8 @@
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C b/src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C
index 6c15c4b01..6c2fe1927 100644
--- a/src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C
+++ b/src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C
@@ -294,9 +294,9 @@ bool Foam::pistonLayer::update()
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
-    List<bool> pistonBelowPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
+    boolList pistonBelowPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/pistonSliding/addPistonFacesPointZonesPistonSliding.H b/src/engine/engineTopoChangerMesh/pistonSliding/addPistonFacesPointZonesPistonSliding.H
index 1049b4e76..cc099b888 100644
--- a/src/engine/engineTopoChangerMesh/pistonSliding/addPistonFacesPointZonesPistonSliding.H
+++ b/src/engine/engineTopoChangerMesh/pistonSliding/addPistonFacesPointZonesPistonSliding.H
@@ -297,7 +297,7 @@
 
             // valve top points (move all with valve displacement)
             dynamicLabelList valvePistonPoints(nPoints() / 10);
-            List<bool> valvePistonPoint(nPoints(), false);
+            boolList valvePistonPoint(nPoints(), false);
             bool foundOne = false;
 
             const cellList& c = cells();
@@ -397,7 +397,7 @@
 
             // valve top points (move all with valve displacement)
             dynamicLabelList pistonPoints(nPoints() / 10);
-            List<bool> pistonPoint(nPoints(), false);
+            boolList pistonPoint(nPoints(), false);
             bool foundOne = false;
 
             const cellList& c = cells();
diff --git a/src/engine/engineTopoChangerMesh/pistonSliding/addValvePistonCellZonesPistonSliding.H b/src/engine/engineTopoChangerMesh/pistonSliding/addValvePistonCellZonesPistonSliding.H
index 1612c75db..b7353ed75 100644
--- a/src/engine/engineTopoChangerMesh/pistonSliding/addValvePistonCellZonesPistonSliding.H
+++ b/src/engine/engineTopoChangerMesh/pistonSliding/addValvePistonCellZonesPistonSliding.H
@@ -52,7 +52,7 @@
 
                 // valve top points (move all with valve displacement)
                 dynamicLabelList valveTopPoints(nPoints() / 10);
-                List<bool> valveTopPoint(nPoints(), false);
+                boolList valveTopPoint(nPoints(), false);
                 bool foundOne = false;
 
                 const cellList& c = cells();
@@ -170,7 +170,7 @@
 
                 // valve bottom points (move all with valve displacement)
                 dynamicLabelList valveBottomPoints(nPoints() / 10);
-                List<bool> valveBottomPoint(nPoints(), false);
+                boolList valveBottomPoint(nPoints(), false);
                 bool foundOne = false;
 
 
diff --git a/src/engine/engineTopoChangerMesh/pistonSliding/movePistonPointsPistonSliding.H b/src/engine/engineTopoChangerMesh/pistonSliding/movePistonPointsPistonSliding.H
index 793b675e3..b8fa93e2e 100644
--- a/src/engine/engineTopoChangerMesh/pistonSliding/movePistonPointsPistonSliding.H
+++ b/src/engine/engineTopoChangerMesh/pistonSliding/movePistonPointsPistonSliding.H
@@ -4,7 +4,7 @@
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
 
-    List<bool> pistonPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
 
     label pistonPtsIndex = pointZones().findZoneID("pistonPoints");
     const labelList& pistonPoints = pointZones()[pistonPtsIndex];
diff --git a/src/engine/engineTopoChangerMesh/pistonSliding/moveTopOfTheValvesPistonSliding.H b/src/engine/engineTopoChangerMesh/pistonSliding/moveTopOfTheValvesPistonSliding.H
index f85d33975..0f81861cf 100644
--- a/src/engine/engineTopoChangerMesh/pistonSliding/moveTopOfTheValvesPistonSliding.H
+++ b/src/engine/engineTopoChangerMesh/pistonSliding/moveTopOfTheValvesPistonSliding.H
@@ -24,7 +24,7 @@
                     movingPointsMaskTop(valveI);
 
                 {
-                    List<bool> valveTopPoint(newPoints.size(), false);
+                    boolList valveTopPoint(newPoints.size(), false);
 
                     label valveTopPtsIndex =
                         pointZones().findZoneID("movingPointsTopZoneV"
diff --git a/src/engine/engineTopoChangerMesh/pistonSliding/moveValvePointsPistonSliding.H b/src/engine/engineTopoChangerMesh/pistonSliding/moveValvePointsPistonSliding.H
index 3b5cff8ee..03f7ef1c2 100644
--- a/src/engine/engineTopoChangerMesh/pistonSliding/moveValvePointsPistonSliding.H
+++ b/src/engine/engineTopoChangerMesh/pistonSliding/moveValvePointsPistonSliding.H
@@ -28,7 +28,7 @@
              && valves_[valveI].isOpen()
             )
             {
-                List<bool> valveTopPoint(newPoints.size(), false);
+                boolList valveTopPoint(newPoints.size(), false);
 
 //                 const scalarField& movingPointsTop =
 //                     movingPointsMaskTop(valveI);
@@ -107,7 +107,7 @@
        if (valves_[valveI].bottomPatchID().active())
        {
            {
-               List<bool> valveBottomPoint(newPoints.size(), false);
+               boolList valveBottomPoint(newPoints.size(), false);
 
                label valveBottomPtsIndex =
                    pointZones().findZoneID
diff --git a/src/engine/engineTopoChangerMesh/simpleTwoStroke/simpleTwoStrokeMove.C b/src/engine/engineTopoChangerMesh/simpleTwoStroke/simpleTwoStrokeMove.C
index e4a2a9cb4..abe7d1ad8 100644
--- a/src/engine/engineTopoChangerMesh/simpleTwoStroke/simpleTwoStrokeMove.C
+++ b/src/engine/engineTopoChangerMesh/simpleTwoStroke/simpleTwoStrokeMove.C
@@ -203,8 +203,8 @@ bool Foam::simpleTwoStroke::update()
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
 
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
 
 //    label pistonPtsIndex = pointZones().findZoneID("pistonPoints");
 //    const labelList& pistonPoints = pointZones()[pistonPtsIndex];
diff --git a/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsLayering.H b/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsLayering.H
index de2a5bc33..3afd46f57 100644
--- a/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsLayering.H
+++ b/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsLayering.H
@@ -12,7 +12,7 @@
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsLayeringThobois.H b/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsLayeringThobois.H
index de2a5bc33..3afd46f57 100644
--- a/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsLayeringThobois.H
+++ b/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsLayeringThobois.H
@@ -12,7 +12,7 @@
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsThobois.H b/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsThobois.H
index 14b8cc637..3f59a064f 100644
--- a/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsThobois.H
+++ b/src/engine/engineTopoChangerMesh/thoboisMesh/movePistonPointsThobois.H
@@ -15,8 +15,8 @@
     // Whether point displacement is by scaling
     boolList scaleDisp(nPoints(), true);
     label nScaled = nPoints();
-    List<bool> pistonPoint(newPoints.size(), false);
-    List<bool> headPoint(newPoints.size(), false);
+    boolList pistonPoint(newPoints.size(), false);
+    boolList headPoint(newPoints.size(), false);
 
     forAll(pistonPoints, i)
     {
diff --git a/src/engine/engineTopoChangerMesh/thoboisSliding/addPistonFacesPointZonesThoboisSliding.H b/src/engine/engineTopoChangerMesh/thoboisSliding/addPistonFacesPointZonesThoboisSliding.H
index 1049b4e76..cc099b888 100644
--- a/src/engine/engineTopoChangerMesh/thoboisSliding/addPistonFacesPointZonesThoboisSliding.H
+++ b/src/engine/engineTopoChangerMesh/thoboisSliding/addPistonFacesPointZonesThoboisSliding.H
@@ -297,7 +297,7 @@
 
             // valve top points (move all with valve displacement)
             dynamicLabelList valvePistonPoints(nPoints() / 10);
-            List<bool> valvePistonPoint(nPoints(), false);
+            boolList valvePistonPoint(nPoints(), false);
             bool foundOne = false;
 
             const cellList& c = cells();
@@ -397,7 +397,7 @@
 
             // valve top points (move all with valve displacement)
             dynamicLabelList pistonPoints(nPoints() / 10);
-            List<bool> pistonPoint(nPoints(), false);
+            boolList pistonPoint(nPoints(), false);
             bool foundOne = false;
 
             const cellList& c = cells();
diff --git a/src/engine/engineTopoChangerMesh/thoboisSliding/addValvePistonCellZonesThoboisSliding.H b/src/engine/engineTopoChangerMesh/thoboisSliding/addValvePistonCellZonesThoboisSliding.H
index 1612c75db..b7353ed75 100644
--- a/src/engine/engineTopoChangerMesh/thoboisSliding/addValvePistonCellZonesThoboisSliding.H
+++ b/src/engine/engineTopoChangerMesh/thoboisSliding/addValvePistonCellZonesThoboisSliding.H
@@ -52,7 +52,7 @@
 
                 // valve top points (move all with valve displacement)
                 dynamicLabelList valveTopPoints(nPoints() / 10);
-                List<bool> valveTopPoint(nPoints(), false);
+                boolList valveTopPoint(nPoints(), false);
                 bool foundOne = false;
 
                 const cellList& c = cells();
@@ -170,7 +170,7 @@
 
                 // valve bottom points (move all with valve displacement)
                 dynamicLabelList valveBottomPoints(nPoints() / 10);
-                List<bool> valveBottomPoint(nPoints(), false);
+                boolList valveBottomPoint(nPoints(), false);
                 bool foundOne = false;
 
 
diff --git a/src/engine/engineTopoChangerMesh/thoboisSliding/movePistonPointsThoboisSliding.H b/src/engine/engineTopoChangerMesh/thoboisSliding/movePistonPointsThoboisSliding.H
index af03e11e6..280bd2b5e 100644
--- a/src/engine/engineTopoChangerMesh/thoboisSliding/movePistonPointsThoboisSliding.H
+++ b/src/engine/engineTopoChangerMesh/thoboisSliding/movePistonPointsThoboisSliding.H
@@ -5,7 +5,7 @@
         boolList scaleDisp(nPoints(), true);
         label nScaled = nPoints();
 
-        List<bool> pistonPoint(newPoints.size(), false);
+        boolList pistonPoint(newPoints.size(), false);
 
         label pistonPtsIndex = pointZones().findZoneID("pistonPoints");
         const labelList& pistonPoints = pointZones()[pistonPtsIndex];
@@ -79,7 +79,7 @@
             boolList scaleDisp(nPoints(), true);
             label nScaled = nPoints();
 
-            List<bool> pistonPointValve(newPoints.size(), false);
+            boolList pistonPointValve(newPoints.size(), false);
 
             label pistonValvePtsIndex =
             pointZones().findZoneID("valvePistonPointsV"+Foam::name(valveI + 1));
diff --git a/src/engine/engineTopoChangerMesh/thoboisSliding/moveTopOfTheValvesThoboisSliding.H b/src/engine/engineTopoChangerMesh/thoboisSliding/moveTopOfTheValvesThoboisSliding.H
index cf5cc8db5..280dac067 100644
--- a/src/engine/engineTopoChangerMesh/thoboisSliding/moveTopOfTheValvesThoboisSliding.H
+++ b/src/engine/engineTopoChangerMesh/thoboisSliding/moveTopOfTheValvesThoboisSliding.H
@@ -19,7 +19,7 @@
 
                     {
 
-                        List<bool> valveTopPoint(newPoints.size(), false);
+                        boolList valveTopPoint(newPoints.size(), false);
 
                         label valveTopPtsIndex = pointZones().findZoneID("movingPointsTopZoneV"+ Foam::name(valveI+1));
                         const labelList& valveTopPoints = pointZones()[valveTopPtsIndex];
diff --git a/src/engine/engineTopoChangerMesh/thoboisSliding/moveValvePointsThoboisSliding.H b/src/engine/engineTopoChangerMesh/thoboisSliding/moveValvePointsThoboisSliding.H
index a446caa0e..1cf42dd9c 100644
--- a/src/engine/engineTopoChangerMesh/thoboisSliding/moveValvePointsThoboisSliding.H
+++ b/src/engine/engineTopoChangerMesh/thoboisSliding/moveValvePointsThoboisSliding.H
@@ -16,7 +16,7 @@
             if(valves_[valveI].poppetPatchID().active() && valves_[valveI].isOpen())
             {
 
-                List<bool> valveTopPoint(newPoints.size(), false);
+                boolList valveTopPoint(newPoints.size(), false);
 
 //                label layeringVPtsIndex = pointZones().findZoneID("movingPointsTopZoneV"+ Foam::name(valveI+1));
 //                const labelList& layeringVPoints = pointZones()[layeringVPtsIndex];
diff --git a/src/engine/engineTopoChangerMesh/verticalValves/movePistonPoints.H b/src/engine/engineTopoChangerMesh/verticalValves/movePistonPoints.H
index 9ba987c61..dcd8a6932 100644
--- a/src/engine/engineTopoChangerMesh/verticalValves/movePistonPoints.H
+++ b/src/engine/engineTopoChangerMesh/verticalValves/movePistonPoints.H
@@ -4,7 +4,7 @@
 
         boolList scaleDisp(nPoints(), true);
 
-        List<bool> pistonPoint(newPoints.size(), false);
+        boolList pistonPoint(newPoints.size(), false);
 
         const scalarField& movingPointsMPiston = movingPointsMaskPiston();
 
@@ -109,7 +109,7 @@
 
             const scalarField& movingPointsMPistonValves = movingPointsMaskPistonValves(valveI);
 
-            List<bool> pistonPointValve(newPoints.size(), false);
+            boolList pistonPointValve(newPoints.size(), false);
             labelList pistonPointsV;
 
             {
diff --git a/src/engine/engineTopoChangerMesh/verticalValves/moveTopOfTheValves.H b/src/engine/engineTopoChangerMesh/verticalValves/moveTopOfTheValves.H
index 81145fb1d..b697ebd49 100644
--- a/src/engine/engineTopoChangerMesh/verticalValves/moveTopOfTheValves.H
+++ b/src/engine/engineTopoChangerMesh/verticalValves/moveTopOfTheValves.H
@@ -15,7 +15,7 @@
                     const scalarField& movingPointsTop = movingPointsMaskTop(valveI);
 
                     {
-                        List<bool> valveTopPoint(newPoints.size(), false);
+                        boolList valveTopPoint(newPoints.size(), false);
 
                         labelList valveTopPoints;
 
diff --git a/src/engine/engineTopoChangerMesh/verticalValves/moveValvePoints.H b/src/engine/engineTopoChangerMesh/verticalValves/moveValvePoints.H
index c6a1c77ef..57671a543 100644
--- a/src/engine/engineTopoChangerMesh/verticalValves/moveValvePoints.H
+++ b/src/engine/engineTopoChangerMesh/verticalValves/moveValvePoints.H
@@ -17,7 +17,7 @@
             {
                 const scalarField& movingPointsTop = movingPointsMaskTop(valveI+1);
 
-                List<bool> valveTopPoint(newPoints.size(), false);
+                boolList valveTopPoint(newPoints.size(), false);
 
                 labelList valveTopPoints;
 
@@ -107,7 +107,7 @@
             const scalarField& movingPointsBottom = movingPointsMaskBottom(valveI);
             {
 
-                List<bool> valveBottomPoint(newPoints.size(), false);
+                boolList valveBottomPoint(newPoints.size(), false);
 
                 labelList valveBottomPoints;
 
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index b938bff1d..3d8ee8b27 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -367,7 +367,7 @@ Foam::faMesh::faMesh
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        List<label>(0)
+        labelList(0)
     ),
     boundary_
     (
@@ -521,7 +521,7 @@ Foam::faMesh::faMesh
     {
         label curMeshEdge = meshEdges[edgeI];
 
-        labelList curEdgePatchIDs(2, -1);
+        labelList curEdgePatchIDs(2, label(-1));
 
         label patchI = -1;
 
@@ -1054,13 +1054,13 @@ void Foam::faMesh::addFaPatches(const List<faPatch*>& p)
 }
 
 
-Foam::label Foam::faMesh::comm() const
+int Foam::faMesh::comm() const
 {
     return comm_;
 }
 
 
-Foam::label& Foam::faMesh::comm()
+int& Foam::faMesh::comm()
 {
     return comm_;
 }
diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H
index d4c3a643c..781c34127 100644
--- a/src/finiteArea/faMesh/faMesh.H
+++ b/src/finiteArea/faMesh/faMesh.H
@@ -116,7 +116,7 @@ class faMesh
         // Communication support
 
             //- Communicator used for parallel communication
-            label comm_;
+            int comm_;
 
 
     // Demand-driven data
@@ -380,10 +380,10 @@ public:
             // Communication support
 
                 //- Return communicator used for parallel communication
-                label comm() const;
+                int comm() const;
 
                 //- Return communicator used for parallel communication
-                label& comm();
+                int& comm();
 
 
         // Access
diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
index 048b05763..68d0097db 100644
--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@@ -945,7 +945,7 @@ labelList faMesh::internalPoints() const
     const edgeList& edges = patch().edges();
     label nIntEdges = patch().nInternalEdges();
 
-    List<bool> internal (nPoints(), true);
+    boolList internal (nPoints(), true);
 
     for (label curEdge = nIntEdges; curEdge < edges.size(); curEdge++)
     {
@@ -981,7 +981,7 @@ labelList faMesh::boundaryPoints() const
     const edgeList& edges = patch().edges();
     label nIntEdges = patch().nInternalEdges();
 
-    List<bool> internal (nPoints(), true);
+    boolList internal (nPoints(), true);
 
     for (label curEdge = nIntEdges; curEdge < edges.size(); curEdge++)
     {
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index e220e8afd..21159652b 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -56,7 +56,7 @@ processorFaPatch::~processorFaPatch()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::label Foam::processorFaPatch::comm() const
+int Foam::processorFaPatch::comm() const
 {
     return boundaryMesh().mesh().comm();
 }
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
index 45a89e539..a0faf9d8f 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
@@ -211,7 +211,7 @@ public:
         // Communications support
 
             //- Return communicator used for communication
-            virtual label comm() const;
+            virtual int comm() const;
 
             //- Return message tag to use for communication
             virtual int tag() const;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index 77fc30c11..254659b30 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -54,7 +54,7 @@ class fanFvPatchField
     // Private data
 
         //- Fan pressure rise polynomial coefficients
-        List<scalar> f_;
+        scalarList f_;
 
         //- "jump" field
         Field<Type> jump_;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
index 7235c0f5a..1a2278091 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
@@ -120,7 +120,7 @@ Foam::extendedCellToFaceStencil::weightedSum
     for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
     {
         const List<Type>& stField = stencilFld[faceI];
-        const List<scalar>& stWeight = stencilWeights[faceI];
+        const scalarList& stWeight = stencilWeights[faceI];
 
         forAll(stField, i)
         {
@@ -144,7 +144,7 @@ Foam::extendedCellToFaceStencil::weightedSum
             forAll(pSfCorr, i)
             {
                 const List<Type>& stField = stencilFld[faceI];
-                const List<scalar>& stWeight = stencilWeights[faceI];
+                const scalarList& stWeight = stencilWeights[faceI];
 
                 forAll(stField, j)
                 {
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
index 6616d4454..d5de2fa14 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
@@ -76,7 +76,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
         {
             // Flux out of owner. Use upwind (= owner side) stencil.
             const List<Type>& stField = ownFld[faceI];
-            const List<scalar>& stWeight = ownWeights[faceI];
+            const scalarList& stWeight = ownWeights[faceI];
 
             forAll(stField, i)
             {
@@ -86,7 +86,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
         else
         {
             const List<Type>& stField = neiFld[faceI];
-            const List<scalar>& stWeight = neiWeights[faceI];
+            const scalarList& stWeight = neiWeights[faceI];
 
             forAll(stField, i)
             {
@@ -114,7 +114,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
                 {
                     // Flux out of owner. Use upwind (= owner side) stencil.
                     const List<Type>& stField = ownFld[faceI];
-                    const List<scalar>& stWeight = ownWeights[faceI];
+                    const scalarList& stWeight = ownWeights[faceI];
 
                     forAll(stField, j)
                     {
@@ -124,7 +124,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
                 else
                 {
                     const List<Type>& stField = neiFld[faceI];
-                    const List<scalar>& stWeight = neiWeights[faceI];
+                    const scalarList& stWeight = neiWeights[faceI];
 
                     forAll(stField, j)
                     {
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
index 62565b6a8..aca22ba42 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
@@ -117,7 +117,7 @@ Foam::extendedFaceToCellStencil::weightedSum
     forAll(sf, cellI)
     {
         const List<Type>& stField = stencilFld[cellI];
-        const List<scalar>& stWeight = stencilWeights[cellI];
+        const scalarList& stWeight = stencilWeights[cellI];
 
         forAll(stField, i)
         {
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index 3b6d7984d..9bf26481b 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -94,7 +94,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
         {
             if (max(addr[faceI]) >= oldNInternal)
             {
-                addr[faceI] = labelList(1, 0);
+                addr[faceI] = labelList(1, label(0));
                 w[faceI] = scalarList(1, 1.0);
             }
         }
diff --git a/src/foam/algorithms/octree/octree/treeNode.C b/src/foam/algorithms/octree/octree/treeNode.C
index 0af267914..87111c952 100644
--- a/src/foam/algorithms/octree/octree/treeNode.C
+++ b/src/foam/algorithms/octree/octree/treeNode.C
@@ -1279,7 +1279,7 @@ template <class Type>
 void Foam::treeNode<Type>::writeOBJ
 (
     Ostream& os,
-    const label level,
+    const int level,
     label& vertNo
 ) const
 {
diff --git a/src/foam/algorithms/octree/octree/treeNode.H b/src/foam/algorithms/octree/octree/treeNode.H
index ba76405f6..73338497b 100644
--- a/src/foam/algorithms/octree/octree/treeNode.H
+++ b/src/foam/algorithms/octree/octree/treeNode.H
@@ -278,7 +278,7 @@ public:
             //  Updates: start
             const treeLeaf<Type>* findLeafLine
             (
-                const label level,
+                const int level,
                 const Type& shapes,
                 point& start,
                 const point& end
@@ -314,7 +314,7 @@ public:
             void writeOBJ
             (
                 Ostream& os,
-                const label level,
+                const int level,
                 label& vertNo
             ) const;
 
diff --git a/src/foam/containers/Identifiers/Keyed/Keyed.H b/src/foam/containers/Identifiers/Keyed/Keyed.H
index 667aea2e1..98c07a6de 100644
--- a/src/foam/containers/Identifiers/Keyed/Keyed.H
+++ b/src/foam/containers/Identifiers/Keyed/Keyed.H
@@ -79,7 +79,7 @@ public:
         inline static List<Keyed<T> > createList
         (
             const List<T>&,
-            const List<label>& keys
+            const labelList& keys
         );
 
 
diff --git a/src/foam/containers/Identifiers/Keyed/KeyedI.H b/src/foam/containers/Identifiers/Keyed/KeyedI.H
index 47d3abbaf..c6138ac24 100644
--- a/src/foam/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/foam/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 labelList& 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 labelList&)"
         )
             << "size mismatch adding keys to a list:" << nl
             << "List has size " << lst.size()
diff --git a/src/foam/containers/Lists/CompactListList/CompactListList.H b/src/foam/containers/Lists/CompactListList/CompactListList.H
index 456d02742..9965aa46d 100644
--- a/src/foam/containers/Lists/CompactListList/CompactListList.H
+++ b/src/foam/containers/Lists/CompactListList/CompactListList.H
@@ -72,7 +72,7 @@ class CompactListList
     // Private data
 
         //- Offset table
-        List<label> offsets_;
+        labelList offsets_;
 
         //- Packed matrix of data
         List<T> m_;
@@ -131,10 +131,10 @@ public:
             inline bool empty() const;
 
             //- Return the offset table
-            inline const List<label>& offsets() const;
+            inline const labelList& offsets() const;
 
             //- Return non-const access to the offset table
-            inline List<label>& offsets();
+            inline labelList& offsets();
 
             //- Return the packed matrix of data
             inline const List<T>& m() const;
diff --git a/src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C b/src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C
index 6a01d942c..394a1fa08 100644
--- a/src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C
+++ b/src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C
@@ -67,7 +67,7 @@ void Foam::IOdictionary::readFile(const bool masterOnly)
 
         const List<Pstream::commsStruct>& comms =
         (
-            (Pstream::nProcs() < Pstream::nProcsSimpleSum)
+            (Pstream::nProcs() < Pstream::nProcsSimpleSum())
           ? Pstream::linearCommunication()
           : Pstream::treeCommunication()
         );
diff --git a/src/foam/db/IOstreams/Pstreams/IPread.C b/src/foam/db/IOstreams/Pstreams/IPread.C
index bff5dee1b..a8667c4de 100644
--- a/src/foam/db/IOstreams/Pstreams/IPread.C
+++ b/src/foam/db/IOstreams/Pstreams/IPread.C
@@ -157,7 +157,7 @@ Foam::label Foam::IPstream::read
 
         // Check size of message read
 
-        label messageSize;
+        int messageSize;
         MPI_Get_count(&status, MPI_BYTE, &messageSize);
 
         if (messageSize > bufSize)
diff --git a/src/foam/db/IOstreams/Pstreams/IPstream.H b/src/foam/db/IOstreams/Pstreams/IPstream.H
index 312ce7471..7e4fe6f69 100644
--- a/src/foam/db/IOstreams/Pstreams/IPstream.H
+++ b/src/foam/db/IOstreams/Pstreams/IPstream.H
@@ -65,7 +65,7 @@ class IPstream
         const label comm_;
 
         //- Message size
-        label messageSize_;
+        int messageSize_;
 
 
     // Private member functions
diff --git a/src/foam/db/IOstreams/Pstreams/Pstream.C b/src/foam/db/IOstreams/Pstreams/Pstream.C
index ead20d09f..7af8d838a 100644
--- a/src/foam/db/IOstreams/Pstreams/Pstream.C
+++ b/src/foam/db/IOstreams/Pstreams/Pstream.C
@@ -311,8 +311,13 @@ void Foam::Pstream::allocatePstreamCommunicator
         // Set the number of processes to the actual number
         int numProcs;
         MPI_Comm_size(PstreamGlobals::MPICommunicators_[index], &numProcs);
-        procIDs_[index] = identity(numProcs);
-    }
+        //procIDs_[index] = identity(numProcs);
+        procIDs_[index].setSize(numProcs);
+        forAll(procIDs_[index], i)
+        {
+            procIDs_[index][i] = i;
+        }
+     }
     else
     {
         // Create new group
@@ -905,7 +910,7 @@ Foam::Pstream::treeCommunication_(10);
 
 // Allocate a serial communicator. This gets overwritten in parallel mode
 // (by Pstream::setParRun())
-Foam::Pstream::communicator serialComm(-1, Foam::labelList(1, 0), false);
+Foam::Pstream::communicator serialComm(-1, Foam::labelList(1, Foam::label(0)), false);
 
 // Number of processors at which the reduce algorithm changes from linear to
 // tree
diff --git a/src/foam/db/IOstreams/Pstreams/Pstream.H b/src/foam/db/IOstreams/Pstreams/Pstream.H
index 38d67bf08..439cfa455 100644
--- a/src/foam/db/IOstreams/Pstreams/Pstream.H
+++ b/src/foam/db/IOstreams/Pstreams/Pstream.H
@@ -198,7 +198,7 @@ private:
         static DynamicList<List<int> > procIDs_;
 
         //- List of parent communicators
-        static DynamicList<label> parentCommunicator_;
+        static dynamicLabelList parentCommunicator_;
 
         //- Structure for linear communications
         static DynamicList<List<commsStruct> > linearCommunication_;
diff --git a/src/foam/db/IOstreams/Pstreams/PstreamReduceOps.C b/src/foam/db/IOstreams/Pstreams/PstreamReduceOps.C
index 0d4cf3caa..a086ef614 100644
--- a/src/foam/db/IOstreams/Pstreams/PstreamReduceOps.C
+++ b/src/foam/db/IOstreams/Pstreams/PstreamReduceOps.C
@@ -404,7 +404,7 @@ void Foam::reduce
 
 void Foam::reduce
 (
-    List<label>& Value,
+    labelList& Value,
     const minOp<List<label> >& bop,
     const int tag,
     const label comm
@@ -431,7 +431,7 @@ void Foam::reduce
         (
             "void Foam::reduce\n"
             "(\n"
-            "    List<label>& Value,\n"
+            "    labelList& Value,\n"
             "    const minOp<List<label> >& bop,\n"
             "    const int tag,\n"
             "    const label comm\n"
@@ -462,7 +462,7 @@ void Foam::reduce
 
 void Foam::reduce
 (
-    List<label>& Value,
+    labelList& Value,
     const maxOp<List<label> >& bop,
     const int tag,
     const label comm
@@ -489,7 +489,7 @@ void Foam::reduce
         (
             "void Foam::reduce\n"
             "(\n"
-            "    List<label>& Value,\n"
+            "    labelList& Value,\n"
             "    const maxOp<List<label> >& bop,\n"
             "    const int tag,\n"
             "    const label comm\n"
@@ -520,7 +520,7 @@ void Foam::reduce
 
 void Foam::reduce
 (
-    List<label>& Value,
+    labelList& Value,
     const sumOp<List<label> >& bop,
     const int tag,
     const label comm
@@ -547,7 +547,7 @@ void Foam::reduce
         (
             "void Foam::reduce\n"
             "(\n"
-            "    List<label>& Value,\n"
+            "    labelList& Value,\n"
             "    const sumOp<List<label> >& bop,\n"
             "    const int tag,\n"
             "    const label comm\n"
diff --git a/src/foam/db/IOstreams/Pstreams/PstreamReduceOps.H b/src/foam/db/IOstreams/Pstreams/PstreamReduceOps.H
index 6d9e93acc..6fc5267c8 100644
--- a/src/foam/db/IOstreams/Pstreams/PstreamReduceOps.H
+++ b/src/foam/db/IOstreams/Pstreams/PstreamReduceOps.H
@@ -244,7 +244,7 @@ void reduce
 
 void reduce
 (
-    List<label>& Value,
+    labelList& Value,
     const sumOp<List<label> >& bop,
     const int tag = Pstream::msgType(),
     const label comm = Pstream::worldComm
@@ -252,7 +252,7 @@ void reduce
 
 void reduce
 (
-    List<label>& Value,
+    labelList& Value,
     const minOp<List<label> >& bop,
     const int tag = Pstream::msgType(),
     const label comm = Pstream::worldComm
@@ -260,7 +260,7 @@ void reduce
 
 void reduce
 (
-    List<label>& Value,
+    labelList& Value,
     const maxOp<List<label> >& bop,
     const int tag = Pstream::msgType(),
     const label comm = Pstream::worldComm
diff --git a/src/foam/db/Time/timeSelector.C b/src/foam/db/Time/timeSelector.C
index ba4b31942..f9a4b92ce 100644
--- a/src/foam/db/Time/timeSelector.C
+++ b/src/foam/db/Time/timeSelector.C
@@ -53,7 +53,7 @@ bool Foam::timeSelector::selected(const instant& value) const
 
 Foam::List<bool> Foam::timeSelector::selected(const instantList& Times) const
 {
-    List<bool> lst(Times.size(), false);
+    boolList lst(Times.size(), false);
 
     // Check ranges, avoid false positive on constant/
     forAll(Times, timeI)
@@ -166,7 +166,7 @@ Foam::instantList Foam::timeSelector::select
 {
     if (timeDirs.size())
     {
-        List<bool> selectTimes(timeDirs.size(), true);
+        boolList selectTimes(timeDirs.size(), true);
 
         // Determine locations of constant/ and 0/ directories
         label constantIdx = -1;
@@ -316,7 +316,7 @@ Foam::instantList Foam::timeSelector::select
 
     if (timeDirs.size() && args.optionFound("newTimes"))
     {
-        List<bool> selectTimes(timeDirs.size(), true);
+        boolList selectTimes(timeDirs.size(), true);
 
         forAll(timeDirs, timeI)
         {
diff --git a/src/foam/db/Time/timeSelector.H b/src/foam/db/Time/timeSelector.H
index ae9ecf54c..ff35d9b9d 100644
--- a/src/foam/db/Time/timeSelector.H
+++ b/src/foam/db/Time/timeSelector.H
@@ -109,7 +109,7 @@ public:
 
         //- Return the set of selected instants in the given list that are
         //  within the ranges
-        List<bool> selected(const instantList&) const;
+        boolList selected(const instantList&) const;
 
         //- Select a list of Time values that are within the ranges
         instantList select(const instantList&) const;
diff --git a/src/foam/db/regIOobject/regIOobjectRead.C b/src/foam/db/regIOobject/regIOobjectRead.C
index d56250534..a84ab90c5 100644
--- a/src/foam/db/regIOobject/regIOobjectRead.C
+++ b/src/foam/db/regIOobject/regIOobjectRead.C
@@ -204,7 +204,7 @@ bool Foam::regIOobject::read()
 
         const List<Pstream::commsStruct>& comms =
         (
-            (Pstream::nProcs() < Pstream::nProcsSimpleSum)
+            (Pstream::nProcs() < Pstream::nProcsSimpleSum())
           ? Pstream::linearCommunication()
           : Pstream::treeCommunication()
         );
diff --git a/src/foam/db/scalarRange/scalarRanges.C b/src/foam/db/scalarRange/scalarRanges.C
index 2c4db3548..de40d0d03 100644
--- a/src/foam/db/scalarRange/scalarRanges.C
+++ b/src/foam/db/scalarRange/scalarRanges.C
@@ -72,10 +72,10 @@ bool Foam::scalarRanges::selected(const scalar& value) const
 
 Foam::List<bool> Foam::scalarRanges::selected
 (
-    const List<scalar>& values
+    const scalarList& values
 ) const
 {
-    List<bool> lst(values.size(), false);
+    boolList lst(values.size(), false);
 
     // check ranges
     forAll(values, i)
@@ -119,7 +119,7 @@ Foam::List<bool> Foam::scalarRanges::selected
 
 Foam::List<Foam::scalar> Foam::scalarRanges::select
 (
-    const List<scalar>& values
+    const scalarList& values
 ) const
 {
     return subset(selected(values), values);
@@ -128,7 +128,7 @@ Foam::List<Foam::scalar> Foam::scalarRanges::select
 
 void Foam::scalarRanges::inplaceSelect
 (
-    List<scalar>& values
+    scalarList& values
 ) const
 {
     inplaceSubset(selected(values), values);
diff --git a/src/foam/db/scalarRange/scalarRanges.H b/src/foam/db/scalarRange/scalarRanges.H
index 7961d5906..5158083e3 100644
--- a/src/foam/db/scalarRange/scalarRanges.H
+++ b/src/foam/db/scalarRange/scalarRanges.H
@@ -36,7 +36,8 @@ SourceFiles
 #define scalarRanges_H
 
 #include "scalarRange.H"
-#include "List.H"
+#include "scalarList.H"
+#include "boolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,10 +70,10 @@ public:
 
         //- Return the set of selected entries in the given list
         //  that are within the ranges
-        List<bool> selected(const List<scalar>&) const;
+        boolList selected(const scalarList&) const;
 
         //- Select a list of values that are within the ranges
-        List<scalar> select(const List<scalar>&) const;
+        scalarList select(const scalarList&) const;
 
         //- Select a list of values that are within the ranges
         void inplaceSelect(List<scalar>&) const;
diff --git a/src/foam/fields/Fields/transformList/transformList.C b/src/foam/fields/Fields/transformList/transformList.C
index 099c548c5..011492d12 100644
--- a/src/foam/fields/Fields/transformList/transformList.C
+++ b/src/foam/fields/Fields/transformList/transformList.C
@@ -46,11 +46,17 @@ Foam::List<T> Foam::transform
 
 
 template <class T>
-void Foam::transformList
-(
-    const tensorField& rotTensor,
-    UList<T>& field
-)
+void Foam::transformList(const tensor& rotTensor, UList<T>& field)
+{
+    forAll(field, i)
+    {
+        field[i] = transform(rotTensor, field[i]);
+    }
+}
+
+
+template <class T>
+void Foam::transformList(const tensorField& rotTensor, UList<T>& field)
 {
     if (rotTensor.size() == 1)
     {
@@ -79,11 +85,17 @@ void Foam::transformList
 
 
 template <class T>
-void Foam::transformList
-(
-    const tensorField& rotTensor,
-    Map<T>& field
-)
+void Foam::transformList(const tensor& rotTensor, Map<T>& field)
+{
+    forAllIter(typename Map<T>, field, iter)
+    {
+        iter() = transform(rotTensor[0], iter());
+    }
+}
+
+
+template <class T>
+void Foam::transformList(const tensorField& rotTensor, Map<T>& field)
 {
     if (rotTensor.size() == 1)
     {
@@ -105,11 +117,17 @@ void Foam::transformList
 
 
 template <class T>
-void Foam::transformList
-(
-    const tensorField& rotTensor,
-    EdgeMap<T>& field
-)
+void Foam::transformList(const tensor& rotTensor, EdgeMap<T>& field)
+{
+    forAllIter(typename EdgeMap<T>, field, iter)
+    {
+        iter() = transform(rotTensor[0], iter());
+    }
+}
+
+
+template <class T>
+void Foam::transformList(const tensorField& rotTensor, EdgeMap<T>& field)
 {
     if (rotTensor.size() == 1)
     {
diff --git a/src/foam/fields/Fields/transformList/transformList.H b/src/foam/fields/Fields/transformList/transformList.H
index c7962fe39..ca624d99b 100644
--- a/src/foam/fields/Fields/transformList/transformList.H
+++ b/src/foam/fields/Fields/transformList/transformList.H
@@ -60,33 +60,80 @@ List<T> transform
 //- Apply transformation to list. Either single transformation tensor
 //  or one tensor per element.
 template<class T>
+void transformList(const tensor&, UList<T>&);
+template<class T>
 void transformList(const tensorField&, UList<T>&);
 
+template<class T>
+void transformList(const tensor&, Map<T>&);
 template<class T>
 void transformList(const tensorField&, Map<T>&);
 
+template<class T>
+void transformList(const tensor&, EdgeMap<T>&);
 template<class T>
 void transformList(const tensorField&, EdgeMap<T>&);
 
 
+// Specialisations for bool
 template<>
-inline void transformList(const tensorField&, UList<label>&)
+inline void transformList(const tensor&, UList<bool>&)
+{}
+template<>
+inline void transformList(const tensorField&, UList<bool>&)
+{}
+template<>
+inline void transformList(const tensor&, Map<bool>&)
+{}
+template<>
+inline void transformList(const tensorField&, Map<bool>&)
+{}
+template<>
+inline void transformList(const tensor&, EdgeMap<bool>&)
+{}
+template<>
+inline void transformList(const tensorField&, EdgeMap<bool>&)
+{}
+
+
+// Specialisations for label
+template<>
+inline void transformList(const tensor&, labelUList&)
+{}
+template<>
+inline void transformList(const tensorField&, labelUList&)
+{}
+template<>
+inline void transformList(const tensor&, Map<label>&)
 {}
 template<>
 inline void transformList(const tensorField&, Map<label>&)
 {}
 template<>
+inline void transformList(const tensor&, EdgeMap<label>&)
+{}
+template<>
 inline void transformList(const tensorField&, EdgeMap<label>&)
 {}
 
 
+// Specialisations for scalar
+template<>
+inline void transformList(const tensor&, UList<scalar>&)
+{}
 template<>
 inline void transformList(const tensorField&, UList<scalar>&)
 {}
 template<>
+inline void transformList(const tensor&, Map<scalar>&)
+{}
+template<>
 inline void transformList(const tensorField&, Map<scalar>&)
 {}
 template<>
+inline void transformList(const tensor&, EdgeMap<scalar>&)
+{}
+template<>
 inline void transformList(const tensorField&, EdgeMap<scalar>&)
 {}
 
diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C
index 6f3786ac0..c7920b266 100644
--- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C
+++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C
@@ -95,7 +95,7 @@ GGIInterpolation<MasterPatch, SlavePatch>::polygonIntersection
     //  This is a quick intersection test...
 
     // Keep track of who is inside or outside
-    List<bool> subjectVertexInside(subjectPolygon->size());
+    boolList subjectVertexInside(subjectPolygon->size());
 
     insideOutside statusInOut =
         isVertexInsidePolygon
@@ -223,7 +223,7 @@ GGIInterpolation<MasterPatch, SlavePatch>::isVertexInsidePolygon
 (
     const List<point2D>& clippingPolygon,
     const List<point2D>& subjectPolygon,
-    List<bool>& subjectVertexInside
+    boolList& subjectVertexInside
 ) const
 {
     insideOutside retValue = ALL_OUTSIDE;
diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H b/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H
index 1d2981d5e..660bab311 100644
--- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H
+++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H
@@ -71,6 +71,7 @@ SourceFiles
 #include "tolerancesSwitch.H"
 #include "optimisationSwitch.H"
 #include "labelPair.H"
+#include "boolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -398,7 +399,7 @@ class GGIInterpolation
         (
             const List<point2D>& clippingPolygon,
             const List<point2D>& subjectPolygon,
-            List<bool>& subjectVertexInside
+            boolList& subjectVertexInside
         ) const;
 
         //- Compute the intersection between two 2D polygons using the
@@ -415,7 +416,7 @@ class GGIInterpolation
         (
             const List<point2D>& clippingPolygon,
             const List<point2D>& subjectPolygon,
-            const List<bool>& subjectVertexInside
+            const boolList& subjectVertexInside
         ) const;
 
         //- Compute the area of a 2D polygon
diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C
index f3f80c57b..32dff2d35 100644
--- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C
+++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C
@@ -183,7 +183,7 @@ void GGIInterpolation<MasterPatch, SlavePatch>::calcAddressing() const
     // Note: rescale only the local ones. HJ, 27/Apr/2016
     // Note: slave neighbours and weights delayed until master cutting
     // is complete.  HJ, 27/Apr/2016
-    List<DynamicList<label> > masterNeighbors(masterPatch_.size());
+    List<dynamicLabelList > masterNeighbors(masterPatch_.size());
     List<DynamicList<scalar> > masterNeighborsWeights(masterPatch_.size());
 
     // Store slave negighbour weights at the same time, but under
diff --git a/src/foam/interpolations/uniformInterpolationTable/uniformInterpolationTable.C b/src/foam/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
index 9de31226c..28144a75e 100644
--- a/src/foam/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
+++ b/src/foam/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
@@ -52,7 +52,7 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
 )
 :
     IOobject(io),
-    List<scalar>(2, 0.0),
+    scalarList(2, 0.0),
     x0_(0.0),
     dx_(1.0),
     log10_(false),
@@ -91,7 +91,7 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
         IOobject::NO_WRITE,
         false // if used in BCs, could be used by multiple patches
     ),
-    List<scalar>(2, 0.0),
+    scalarList(2, 0.0),
     x0_(readScalar(dict.lookup("x0"))),
     dx_(readScalar(dict.lookup("dx"))),
     log10_(dict.lookupOrDefault<Switch>("log10", false)),
@@ -119,7 +119,7 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
 )
 :
     IOobject(uit),
-    List<scalar>(uit),
+    scalarList(uit),
     x0_(uit.x0_),
     dx_(uit.dx_),
     log10_(uit.log10_),
@@ -216,7 +216,7 @@ void Foam::uniformInterpolationTable<Type>::write() const
 {
     IOdictionary dict(*this);
 
-    dict.add("data", static_cast<const List<scalar>&>(*this));
+    dict.add("data", static_cast<const scalarList&>(*this));
     dict.add("x0", x0_);
     dict.add("dx", dx_);
     if (log10_)
diff --git a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrixUpdateInterfaces.C b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrixUpdateInterfaces.C
index 1e462466b..db3ef2e2b 100644
--- a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrixUpdateInterfaces.C
+++ b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrixUpdateInterfaces.C
@@ -130,7 +130,7 @@ void Foam::BlockLduMatrix<Type>::updateInterfaces
         // Try and consume interfaces as they become available
         bool allUpdated = false;
 
-        for (label i = 0; i < Pstream::nPollProcInterfaces; i++)
+        for (int i = 0; i < Pstream::nPollProcInterfaces; i++)
         {
             allUpdated = true;
 
diff --git a/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/lduInterface/lduInterface.C b/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/lduInterface/lduInterface.C
index 9c6ef9a70..ac309dbba 100644
--- a/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/lduInterface/lduInterface.C
+++ b/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/lduInterface/lduInterface.C
@@ -59,7 +59,7 @@ Foam::autoPtr<Foam::crMatrix> Foam::lduInterface::prolongationTransfer
     );
 
     // Dummy return to make the compiler happy
-    return autoPtr<crMatrix>(new crMatrix(1, 1, labelList(1, 0)));
+    return autoPtr<crMatrix>(NULL);
 }
 
 
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index 2d7469d40..acd12b631 100644
--- a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -132,7 +132,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
         // Try and consume interfaces as they become available
         bool allUpdated = false;
 
-        for (label i = 0; i < Pstream::nPollProcInterfaces; i++)
+        for (label i = 0; i < Pstream::nPollProcInterfaces(); i++)
         {
             allUpdated = true;
 
diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C
index 28dded3f5..8e4f07775 100644
--- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C
+++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C
@@ -812,7 +812,7 @@ Foam::ggiAMGInterface::ggiAMGInterface
 
         // For each new global face created on master proc,
         // record its index under the slave proc array
-        List<DynamicList<label> > procMasterFacesLL(Pstream::nProcs());
+        List<dynamicLabelList > procMasterFacesLL(Pstream::nProcs());
 
         // Note: zone addressing will be assembled only for local clusters
         // using the coarseGlobalFaceOffset
diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C
index c1eae164e..e49555890 100644
--- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C
+++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C
@@ -1003,7 +1003,7 @@ Foam::ggiSAMGInterface::ggiSAMGInterface
 
         // For each new global face created on master proc,
         // record its index under the slave proc array
-        List<DynamicList<label> > procMasterFacesLL(Pstream::nProcs());
+        List<dynamicLabelList > procMasterFacesLL(Pstream::nProcs());
 
         // Note: zone addressing will be assembled only for local clusters
         // using the coarseGlobalFaceOffset
diff --git a/src/foam/meshes/lduMesh/lduPrimitiveMesh.H b/src/foam/meshes/lduMesh/lduPrimitiveMesh.H
index 2a01902c4..a3280e52a 100644
--- a/src/foam/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/foam/meshes/lduMesh/lduPrimitiveMesh.H
@@ -70,7 +70,7 @@ class lduPrimitiveMesh
         lduSchedule patchSchedule_;
 
         //- Communicator to use for parallel communication
-        const label comm_;
+        const int comm_;
 
 
     // Private Member Functions
@@ -93,7 +93,7 @@ public:
             const label nCells,
             const unallocLabelList& l,
             const unallocLabelList& u,
-            const label comm
+            const int comm
         )
         :
             lduAddressing(nCells),
@@ -109,7 +109,7 @@ public:
             const label nCells,
             labelList& l,
             labelList& u,
-            const label comm,
+            const int comm,
             bool reUse
         )
         :
@@ -203,7 +203,7 @@ public:
             }
 
             //- Return communicator used for parallel communication
-            virtual label comm() const
+            virtual int comm() const
             {
                 return comm_;
             }
diff --git a/src/foam/meshes/meshShapes/cell/cell.C b/src/foam/meshes/meshShapes/cell/cell.C
index a84bc1545..d02dbf71c 100644
--- a/src/foam/meshes/meshShapes/cell/cell.C
+++ b/src/foam/meshes/meshShapes/cell/cell.C
@@ -25,6 +25,7 @@ License
 
 #include "cell.H"
 #include "pyramidPointFaceRef.H"
+#include "boolList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -293,7 +294,7 @@ bool Foam::operator==(const cell& a, const cell& b)
         return false;
     }
 
-    List<bool> fnd(a.size(), false);
+    boolList fnd(a.size(), false);
 
     forAll (b, bI)
     {
diff --git a/src/foam/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C b/src/foam/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
index 3da269a1f..1133958c6 100644
--- a/src/foam/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
+++ b/src/foam/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
@@ -88,7 +88,7 @@ void Foam::pointPatchMapper::calcAddressing() const
             else
             {
                 // Inserted point. Map from point0 (arbitrary choice)
-                addr[i] = labelList(1, 0);
+                addr[i] = labelList(1, label(0));
                 w[i] = scalarList(1, 1.0);
             }
         }
diff --git a/src/foam/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/foam/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index 45429b0c9..38df6f794 100644
--- a/src/foam/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/foam/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -202,7 +202,7 @@ void Foam::cellMapper::calcAddressing() const
             if (addr[cellI].empty())
             {
                 // Mapped from a dummy cell
-                addr[cellI] = labelList(1, 0);
+                addr[cellI] = labelList(1, label(0));
                 w[cellI] = scalarList(1, 1.0);
 
                 insertedCells[nInsertedCells] = cellI;
diff --git a/src/foam/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/foam/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index eca5f994c..ba7dd3c8f 100644
--- a/src/foam/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/foam/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -177,7 +177,7 @@ void Foam::faceMapper::calcAddressing() const
             if (addr[faceI].empty())
             {
                 // Mapped from a dummy face
-                addr[faceI] = labelList(1, 0);
+                addr[faceI] = labelList(1, label(0));
                 w[faceI] = scalarList(1, 1.0);
 
                 insertedFaces[nInsertedFaces] = faceI;
diff --git a/src/foam/meshes/polyMesh/mapPolyMesh/pointMapper/pointMapper.C b/src/foam/meshes/polyMesh/mapPolyMesh/pointMapper/pointMapper.C
index 4bda9e423..46a107664 100644
--- a/src/foam/meshes/polyMesh/mapPolyMesh/pointMapper/pointMapper.C
+++ b/src/foam/meshes/polyMesh/mapPolyMesh/pointMapper/pointMapper.C
@@ -138,7 +138,7 @@ void Foam::pointMapper::calcAddressing() const
             if (addr[pointI].size() == 0)
             {
                 // Mapped from a dummy point. Take point 0 with weight 1.
-                addr[pointI] = labelList(1, 0);
+                addr[pointI] = labelList(1, label(0));
                 w[pointI] = scalarList(1, 1.0);
 
                 insertedPoints[nInsertedPoints] = pointI;
diff --git a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 69e2f9c7e..ca68515da 100644
--- a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -515,7 +515,7 @@ Foam::labelList Foam::polyBoundaryMesh::findIndices
     const bool usePatchGroups
 ) const
 {
-    DynamicList<label> indices;
+    dynamicLabelList indices;
 
     if (!key.empty())
     {
diff --git a/src/foam/primitives/VectorN/TensorN.H b/src/foam/primitives/VectorN/TensorN.H
index 68af39b76..e4befbed4 100644
--- a/src/foam/primitives/VectorN/TensorN.H
+++ b/src/foam/primitives/VectorN/TensorN.H
@@ -37,6 +37,7 @@ SourceFiles
 #include "VectorN.H"
 #include "SphericalTensorN.H"
 #include "DiagTensorN.H"
+#include "labelList.H"
 
 // * * * * * * * * * * * * * Forward Declarations  * * * * * * * * * * * * * //
 
diff --git a/src/foam/primitives/VectorN/TensorNI.H b/src/foam/primitives/VectorN/TensorNI.H
index 22684f587..e4c9f33fb 100644
--- a/src/foam/primitives/VectorN/TensorNI.H
+++ b/src/foam/primitives/VectorN/TensorNI.H
@@ -823,7 +823,7 @@ inline Cmpt det(const TensorN<Cmpt, length>& t)
         }
 
         // Handle +/- sign switch
-        result += pow(-1, i)*t(i, 0)*det(subMatrix);
+        result += pow(label(-1), i)*t(i, 0)*det(subMatrix);
     }
 
     return result;
@@ -859,7 +859,7 @@ inline TensorN<Cmpt, length> inv(const TensorN<Cmpt, length>& t)
     Cmpt* __restrict__ destIter;
 
     // Lists used for bookkeeping on the pivoting
-    List<label> indexCol(length), indexRow(length), iPivot(length);
+    labelList indexCol(length), indexRow(length), iPivot(length);
 
     iPivot = 0;
 
diff --git a/src/foam/primitives/transform/transform.H b/src/foam/primitives/transform/transform.H
index 217b5599a..bbbfc78c6 100644
--- a/src/foam/primitives/transform/transform.H
+++ b/src/foam/primitives/transform/transform.H
@@ -70,6 +70,12 @@ inline tmp<tensorField> rotationTensor
 }
 
 
+inline label transform(const tensor&, const bool i)
+{
+    return i;
+}
+
+
 inline label transform(const tensor&, const label i)
 {
     return i;
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
index 9e929c4e1..d2479535f 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
@@ -50,7 +50,7 @@ makeCompactCellFaceAddressingAndFaceWeights
     labelList& cellCells,
     labelList& cellCellOffsets,
     const vectorField& Si,
-    List<scalar>& faceWeights
+    scalarList& faceWeights
 )
 {
     const label nFineCells = fineAddressing.size();
@@ -106,7 +106,7 @@ makeCompactCellFaceAddressingAndFaceWeights
 
 Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
 (
-    label& nCoarseCells,
+    int& nCoarseCells,
     const label minSize,
     const label maxSize,
     const lduAddressing& fineAddressing,
@@ -122,7 +122,7 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
     labelList cellCellOffsets;
 
     // Face weights = face areas of the internal faces
-    List<scalar> faceWeights;
+    scalarList faceWeights;
 
     // Create the compact addressing for cellCells and faceWeights
     makeCompactCellFaceAddressingAndFaceWeights
@@ -135,7 +135,7 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
     );
 
     // MGridGen agglomeration options.
-    labelList options(4, 0);
+    List<int> options(4);
     options[0] = 4;                   // globular agglom
     options[1] = 6;                   // objective F3 and F2
     options[2] = 128;                 // debugging output level
@@ -143,7 +143,7 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
 
 
     // output: cell -> processor addressing
-    List<int> finalAgglom(nFineCells);
+    labelList finalAgglom(nFineCells);
     int nMoves = -1;
 
 #   ifdef WM_DP
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
index ab1aee8bf..f80a723cd 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
@@ -95,7 +95,7 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
 
     while (nCreatedLevels < maxLevels_ - 1)
     {
-        label nCoarseCells = -1;
+        int nCoarseCells = -1;
 
         tmp<labelField> finalAgglomPtr = agglomerate
         (
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
index 610500735..bcfd271bb 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
@@ -68,13 +68,13 @@ class MGridGenGAMGAgglomeration
             labelList& cellCells,
             labelList& cellCellOffsets,
             const vectorField& Si,
-            List<scalar>& faceWeights
+            scalarList& faceWeights
         );
 
         //- Calculate and return agglomeration
         tmp<labelField> agglomerate
         (
-            label& nCoarseCells,
+            int& nCoarseCells,
             const label minSize,
             const label maxSize,
             const lduAddressing& fineAddressing,
diff --git a/src/immersedBoundary/immersedBoundary/finiteVolume/immersedBoundaryFvcReconstruct/immersedBoundaryFvcReconstruct.C b/src/immersedBoundary/immersedBoundary/finiteVolume/immersedBoundaryFvcReconstruct/immersedBoundaryFvcReconstruct.C
index 98cb08a27..a03af83d8 100644
--- a/src/immersedBoundary/immersedBoundary/finiteVolume/immersedBoundaryFvcReconstruct/immersedBoundaryFvcReconstruct.C
+++ b/src/immersedBoundary/immersedBoundary/finiteVolume/immersedBoundaryFvcReconstruct/immersedBoundaryFvcReconstruct.C
@@ -103,7 +103,7 @@ reconstructIb
     Field<SymmTensor<scalar> > surfaceSumSqrSfIn = surfaceSumSqrSf.internalField();
 
     // Keep treck of the zero determinant cells
-    DynamicList<label> openCells(20);
+    dynamicLabelList openCells(20);
 
     // Check for zero determinant
     forAll(surfaceSumSqrSfIn, cellI)
diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
index b14a4f102..db13254e5 100644
--- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
+++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
@@ -68,7 +68,7 @@ private:
         label nHoles_;
         scalar umbrellaAngle_;
         scalar nozzleTipDiameter_;
-        List<scalar> angleSpacing_;
+        scalarList angleSpacing_;
         scalar d_;
         scalar Cd_;
         scalar mass_;
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index f1ab62625..48d5577fe 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/src/lagrangian/dieselSpray/parcel/parcel.C
@@ -64,7 +64,7 @@ Foam::parcel::parcel
     const vector& U,
     const vector& Uturb,
     const scalarField& X,
-    const List<word>& liquidNames
+    const wordList& liquidNames
 )
 :
     Particle<parcel>(cloud, position, cellI),
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.H b/src/lagrangian/dieselSpray/parcel/parcel.H
index 404adc970..24f035c07 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.H
+++ b/src/lagrangian/dieselSpray/parcel/parcel.H
@@ -53,7 +53,7 @@ class parcel
     // Private member data
 
         // Reference to the names of the liquid components
-            List<word> liquidComponents_;
+            wordList liquidComponents_;
 
         // Defining data (read and written to field files)
 
@@ -165,7 +165,7 @@ public:
             const vector& U,
             const vector& Uturb,
             const scalarField& X,
-            const List<word>& liquidNames
+            const wordList& liquidNames
         );
 
         //- Construct from Istream reading field values if required
@@ -182,10 +182,10 @@ public:
         // Access
 
             //- Return the names of the liquid components
-            inline const List<word>& liquidNames() const;
+            inline const wordList& liquidNames() const;
 
             //- Return the names of the liquid fuel components - identical with liquidNames
-            inline const List<word>& fuelNames() const;
+            inline const wordList& fuelNames() const;
 
             //- Return diameter of droplets in parcel
             inline scalar d() const;
diff --git a/src/lagrangian/dieselSpray/parcel/parcelI.H b/src/lagrangian/dieselSpray/parcel/parcelI.H
index 96402f6ba..5c19c7d26 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelI.H
+++ b/src/lagrangian/dieselSpray/parcel/parcelI.H
@@ -30,12 +30,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const List<word>& parcel::liquidNames() const
+inline const wordList& parcel::liquidNames() const
 {
     return liquidComponents_;
 }
 
-inline const List<word>& parcel::fuelNames() const
+inline const wordList& parcel::fuelNames() const
 {
     return liquidComponents_;
 }
diff --git a/src/lagrangian/dieselSpray/parcel/parcelIO.C b/src/lagrangian/dieselSpray/parcel/parcelIO.C
index 6883421dc..e06a75ac8 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelIO.C
+++ b/src/lagrangian/dieselSpray/parcel/parcelIO.C
@@ -179,7 +179,7 @@ void Foam::parcel::readFields
         const parcel& p0 = iter();
 
         label nX = p0.X().size();
-        const List<word>& names = p0.liquidNames();
+        const wordList& names = p0.liquidNames();
 
         for (label j=0; j<nX; j++)
         {
@@ -272,7 +272,7 @@ void Foam::parcel::writeFields
         const parcel& p0 = iter();
 
         label nX = p0.X().size();
-        const List<word>& names = p0.liquidNames();
+        const wordList& names = p0.liquidNames();
 
         for (label j=0; j<nX; j++)
         {
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 4835ecb43..375691539 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -144,9 +144,9 @@ class spray
             const PtrList<gasThermoPhysics>& gasProperties_;
             const basicMultiComponentMixture& composition_;
 
-            List<label> liquidToGasIndex_;
-            List<label> gasToLiquidIndex_;
-            List<bool> isLiquidFuel_;
+            labelList liquidToGasIndex_;
+            labelList gasToLiquidIndex_;
+            boolList isLiquidFuel_;
 
 
         // Necessary 2D-information
@@ -280,9 +280,9 @@ public:
             inline const PtrList<gasThermoPhysics>& gasProperties() const;
             inline const basicMultiComponentMixture& composition() const;
 
-            inline const List<label>& liquidToGasIndex() const;
-            inline const List<label>& gasToLiquidIndex() const;
-            inline const List<bool>& isLiquidFuel() const;
+            inline const labelList& liquidToGasIndex() const;
+            inline const labelList& gasToLiquidIndex() const;
+            inline const boolList& isLiquidFuel() const;
 
             inline const bool& twoD() const;
             inline const vector& axisOfSymmetry() const;
diff --git a/src/lagrangian/dieselSpray/spray/sprayI.H b/src/lagrangian/dieselSpray/spray/sprayI.H
index 60d9636b4..0f69c2121 100644
--- a/src/lagrangian/dieselSpray/spray/sprayI.H
+++ b/src/lagrangian/dieselSpray/spray/sprayI.H
@@ -276,19 +276,19 @@ inline const basicMultiComponentMixture& spray::composition() const
 }
 
 
-inline const List<label>& spray::liquidToGasIndex() const
+inline const labelList& spray::liquidToGasIndex() const
 {
     return liquidToGasIndex_;
 }
 
 
-inline const List<label>& spray::gasToLiquidIndex() const
+inline const labelList& spray::gasToLiquidIndex() const
 {
     return gasToLiquidIndex_;
 }
 
 
-inline const List<bool>& spray::isLiquidFuel() const
+inline const boolList& spray::isLiquidFuel() const
 {
     return isLiquidFuel_;
 }
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C
index 566f85044..f575da005 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C
@@ -96,7 +96,7 @@ void Foam::DsmcCloud<ParcelType>::initialise
         dsmcInitialiseDict.subDict("numberDensities")
     );
 
-    List<word> molecules(numberDensitiesDict.toc());
+    wordList molecules(numberDensitiesDict.toc());
 
     Field<scalar> numberDensities(molecules.size());
 
@@ -128,7 +128,7 @@ void Foam::DsmcCloud<ParcelType>::initialise
         // record the vertex labels of each.
         scalarList cTetVFracs(nTets, 0.0);
 
-        List<labelList> tetPtIs(nTets, labelList(3,-1));
+        List<labelList> tetPtIs(nTets, labelList(3, label(-1)));
 
         // Keep track of which tet this is.
         label tet = 0;
@@ -323,7 +323,7 @@ void Foam::DsmcCloud<ParcelType>::collisions()
             }
 
             // Inverse addressing specifying which subCell a parcel is in
-            List<label> whichSubCell(cellParcels.size());
+            labelList whichSubCell(cellParcels.size());
 
             const point& cC = mesh_.cellCentres()[celli];
 
@@ -367,7 +367,7 @@ void Foam::DsmcCloud<ParcelType>::collisions()
                 // Declare the second collision candidate
                 label candidateQ = -1;
 
-                List<label> subCellPs = subCells[whichSubCell[candidateP]];
+                labelList subCellPs = subCells[whichSubCell[candidateP]];
 
                 label nSC = subCellPs.size();
 
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.H
index 321382325..b5bac1860 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.H
@@ -87,7 +87,7 @@ class DsmcCloud
         // The position of an entry in the list maps to the label identifying
         // the typeId, i.e. where typeIdList_ = (N2 O2 CO2)
         // N2 has typeId label = 0, O2 = 1, CO2 = 2.
-        List<word> typeIdList_;
+        wordList typeIdList_;
 
         //- Number of real atoms/molecules represented by a parcel
         scalar nParticle_;
@@ -239,7 +239,7 @@ public:
                 inline const IOdictionary& particleProperties() const;
 
                 //- Return the idList
-                inline const List<word>& typeIdList() const;
+                inline const wordList& typeIdList() const;
 
                 //- Return the number of real particles represented by one
                 //  parcel
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index 6fdb143d4..9887ef023 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -61,7 +61,7 @@ Foam::FreeStream<CloudType>::FreeStream
         this->coeffDict().subDict("numberDensities")
     );
 
-    List<word> molecules(numberDensitiesDict.toc());
+    wordList molecules(numberDensitiesDict.toc());
 
     // Initialise the particleFluxAccumulators_
     particleFluxAccumulators_.setSize(patches_.size());
@@ -216,7 +216,7 @@ void Foam::FreeStream<CloudType>::inflow()
             scalar fA = mag(patch.faceAreas()[f]);
 
             // Cumulative triangle area fractions
-            List<scalar> cTriAFracs(nVertices);
+            scalarList cTriAFracs(nVertices);
 
             scalar previousCummulativeSum = 0.0;
 
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
index b510bab42..892ae3d0d 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
@@ -57,7 +57,7 @@ class FreeStream
         labelList patches_;
 
         //- The molecule types to be introduced
-        List<label> moleculeTypeIds_;
+        labelList moleculeTypeIds_;
 
         //- The number density of the species in the inflow
         Field<scalar> numberDensities_;
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 24b2167e4..db83c51a1 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -80,7 +80,7 @@ private:
         word stateLabel_;
 
         //- List of component names
-        List<word> names_;
+        wordList names_;
 
         //- List of component mass fractions
         scalarField Y_;
@@ -149,7 +149,7 @@ public:
             word phaseTypeName() const;
 
             //- Return the list of component names
-            const List<word>& names() const;
+            const wordList& names() const;
 
             //- Return const access to a component name
             const word& name(const label cmptI) const;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index c28fd8e1b..45ecf2fce 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -82,7 +82,7 @@ class KinematicLookupTableInjection
         kinematicParcelInjectionDataIOList injectors_;
 
         //- List of injector cells per injector
-        List<label> injectorCells_;
+        labelList injectorCells_;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
index 9b4bb8fcc..1806a4cdf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
@@ -54,7 +54,7 @@ class LocalInteraction
         const List<patchInteractionData> patchData_;
 
         //- List of participating patch ids
-        List<label> patchIds_;
+        labelList patchIds_;
 
 
     // Private member functions
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index 34cbce83f..827131dbc 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -85,7 +85,7 @@ class ReactingLookupTableInjection
         reactingParcelInjectionDataIOList injectors_;
 
         //- List of injector cells per injector
-        List<label> injectorCells_;
+        labelList injectorCells_;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 26de9c595..f720a7603 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -57,13 +57,13 @@ protected:
         autoPtr<liquidMixture> liquids_;
 
         //- List of active liquid names
-        List<word> activeLiquids_;
+        wordList activeLiquids_;
 
         //- Mapping between liquid and carrier species
-        List<label> liqToCarrierMap_;
+        labelList liqToCarrierMap_;
 
         //- Mapping between local and global liquid species
-        List<label> liqToLiqMap_;
+        labelList liqToLiqMap_;
 
 
     // Protected member functions
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 6d8e9eef1..378d37a81 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -88,7 +88,7 @@ class ReactingMultiphaseLookupTableInjection
         reactingMultiphaseParcelInjectionDataIOList injectors_;
 
         //- List of injector cells per injector
-        List<label> injectorCells_;
+        labelList injectorCells_;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index c8a98a118..6210aa1bb 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -84,7 +84,7 @@ class ThermoLookupTableInjection
         kinematicParcelInjectionDataIOList injectors_;
 
         //- List of injector cells per injector
-        List<label> injectorCells_;
+        labelList injectorCells_;
 
 
 protected:
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
index 653d60898..98b30e159 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
@@ -66,7 +66,7 @@ class bufferedAccumulator
 
         label averagesTaken_;
 
-        List<label> bufferOffsets_;
+        labelList bufferOffsets_;
 
 
     // Private Member Functions
@@ -128,7 +128,7 @@ public:
 
             inline label bufferLength() const;
 
-            inline const List<label>& bufferOffsets() const;
+            inline const labelList& bufferOffsets() const;
 
 
         // Edit
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
index ddef0a0d2..5c4659fa6 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
@@ -66,7 +66,7 @@ inline label bufferedAccumulator<Type>::bufferLength() const
 
 
 template<class Type>
-inline const List<label>& bufferedAccumulator<Type>::bufferOffsets() const
+inline const labelList& bufferedAccumulator<Type>::bufferOffsets() const
 {
     return bufferOffsets_;
 }
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
index 0e8e37739..8fea4c912 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
@@ -143,7 +143,7 @@ void Foam::correlationFunction<Type>::calculateCorrelationFunction
             << abort(FatalError);
     }
 
-    List<scalar> cFSums(nBuffers(),0.0);
+    scalarList cFSums(nBuffers(),0.0);
 
     forAll(tZeroBuffers_, tZB)
     {
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index 23b80ed94..e3d7adb49 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -24,6 +24,7 @@ License
 \*----------------------------------------------------------------------------*/
 
 #include "distribution.H"
+#include "labelList.H"
 
 namespace Foam
 {
@@ -106,7 +107,7 @@ scalar distribution::mean() const
 
     scalar totEnt = approxTotalEntries();
 
-    List<label> keys = toc();
+    labelList keys = toc();
 
     forAll(keys,k)
     {
@@ -227,7 +228,7 @@ void distribution::insertMissingKeys()
 {
     iterator iter(this->begin());
 
-    List<label> keys = toc();
+    labelList keys = toc();
 
     sort(keys);
 
@@ -252,7 +253,7 @@ List< Pair<scalar> > distribution::normalised()
 
     insertMissingKeys();
 
-    List<label> keys = toc();
+    labelList keys = toc();
 
     sort(keys);
 
@@ -384,7 +385,7 @@ List<Pair<scalar> > distribution::raw()
 {
     insertMissingKeys();
 
-    List<label> keys = toc();
+    labelList keys = toc();
 
     sort(keys);
 
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
index 14ffe4433..f68ec313f 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
@@ -81,15 +81,15 @@ public:
 
             Field<vector> siteReferencePositions_;
 
-            List<scalar> siteMasses_;
+            scalarList siteMasses_;
 
-            List<scalar> siteCharges_;
+            scalarList siteCharges_;
 
-            List<label> siteIds_;
+            labelList siteIds_;
 
-            List<bool> pairPotentialSites_;
+            boolList pairPotentialSites_;
 
-            List<bool> electrostaticSites_;
+            boolList electrostaticSites_;
 
             diagTensor momentOfInertia_;
 
@@ -101,8 +101,8 @@ public:
 
             void setInteracionSiteBools
             (
-                const List<word>& siteIds,
-                const List<word>& pairPotSiteIds
+                const wordList& siteIds,
+                const wordList& pairPotSiteIds
             );
 
             bool linearMoleculeTest() const;
@@ -119,19 +119,19 @@ public:
 
         inline const Field<vector>& siteReferencePositions() const;
 
-        inline const List<scalar>& siteMasses() const;
+        inline const scalarList& siteMasses() const;
 
-        inline const List<scalar>& siteCharges() const;
+        inline const scalarList& siteCharges() const;
 
-        inline const List<label>& siteIds() const;
+        inline const labelList& siteIds() const;
 
-        inline List<label>& siteIds();
+        inline labelList& siteIds();
 
-        inline const List<bool>& pairPotentialSites() const;
+        inline const boolList& pairPotentialSites() const;
 
         inline bool pairPotentialSite(label sId) const;
 
-        inline const List<bool>& electrostaticSites() const;
+        inline const boolList& electrostaticSites() const;
 
         inline bool electrostaticSite(label sId) const;
 
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
index dfb09d5d5..33335d3e5 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
@@ -56,8 +56,8 @@ inline Foam::molecule::constantProperties::constantProperties
 
     setInteracionSiteBools
     (
-        List<word>(dict.lookup("siteIds")),
-        List<word>(dict.lookup("pairPotentialSiteIds"))
+        wordList(dict.lookup("siteIds")),
+        wordList(dict.lookup("pairPotentialSiteIds"))
     );
 
     mass_ = sum(siteMasses_);
@@ -273,8 +273,8 @@ inline void Foam::molecule::constantProperties::checkSiteListSizes() const
 
 inline void Foam::molecule::constantProperties::setInteracionSiteBools
 (
-    const List<word>& siteIds,
-    const List<word>& pairPotSiteIds
+    const wordList& siteIds,
+    const wordList& pairPotSiteIds
 )
 {
     pairPotentialSites_.setSize(siteIds_.size());
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 56bbfccce..98164e37a 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -47,11 +47,11 @@ void Foam::moleculeCloud::buildConstProps()
 {
     Info<< nl << "Reading moleculeProperties dictionary." << endl;
 
-    const List<word>& idList(pot_.idList());
+    const wordList& idList(pot_.idList());
 
     constPropList_.setSize(idList.size());
 
-    const List<word>& siteIdList(pot_.siteIdList());
+    const wordList& siteIdList(pot_.siteIdList());
 
     IOdictionary moleculePropertiesDict
     (
@@ -72,9 +72,9 @@ void Foam::moleculeCloud::buildConstProps()
 
         const dictionary& molDict(moleculePropertiesDict.subDict(id));
 
-        List<word> siteIdNames = molDict.lookup("siteIds");
+        wordList siteIdNames = molDict.lookup("siteIds");
 
-        List<label> siteIds(siteIdNames.size());
+        labelList siteIds(siteIdNames.size());
 
         forAll(siteIdNames, sI)
         {
@@ -196,7 +196,7 @@ void Foam::moleculeCloud::calculatePairForce()
 
         forAll(ril, r)
         {
-            const List<label>& realCells = ril[r].realCellsForInteraction();
+            const labelList& realCells = ril[r].realCellsForInteraction();
 
             forAll(ril[r], refMols)
             {
@@ -515,7 +515,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
                 const vector bulkVelocity(zoneDict.lookup("bulkVelocity"));
 
-                List<word> latticeIds
+                wordList latticeIds
                 (
                     zoneDict.lookup("latticeIds")
                 );
@@ -613,7 +613,7 @@ void Foam::moleculeCloud::initialiseMolecules
                 {
                     tethered = bool
                     (
-                        List<word>(zoneDict.lookup("tetherSiteIds")).size()
+                        wordList(zoneDict.lookup("tetherSiteIds")).size()
                     );
                 }
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
index eac923805..179161524 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
@@ -43,17 +43,17 @@ inline void Foam::moleculeCloud::evaluatePair
 
     const molecule::constantProperties& constPropJ(constProps(idJ));
 
-    List<label> siteIdsI = constPropI.siteIds();
+    labelList siteIdsI = constPropI.siteIds();
 
-    List<label> siteIdsJ = constPropJ.siteIds();
+    labelList siteIdsJ = constPropJ.siteIds();
 
-    List<bool> pairPotentialSitesI = constPropI.pairPotentialSites();
+    boolList pairPotentialSitesI = constPropI.pairPotentialSites();
 
-    List<bool> electrostaticSitesI = constPropI.electrostaticSites();
+    boolList electrostaticSitesI = constPropI.electrostaticSites();
 
-    List<bool> pairPotentialSitesJ = constPropJ.pairPotentialSites();
+    boolList pairPotentialSitesJ = constPropJ.pairPotentialSites();
 
-    List<bool> electrostaticSitesJ = constPropJ.electrostaticSites();
+    boolList electrostaticSitesJ = constPropJ.electrostaticSites();
 
     forAll(siteIdsI, sI)
     {
@@ -174,17 +174,17 @@ inline void Foam::moleculeCloud::evaluatePair
 
     const molecule::constantProperties& constPropRef(constProps(idRef));
 
-    List<label> siteIdsReal = constPropReal.siteIds();
+    labelList siteIdsReal = constPropReal.siteIds();
 
-    List<label> siteIdsRef = constPropRef.siteIds();
+    labelList siteIdsRef = constPropRef.siteIds();
 
-    List<bool> pairPotentialSitesReal = constPropReal.pairPotentialSites();
+    boolList pairPotentialSitesReal = constPropReal.pairPotentialSites();
 
-    List<bool> electrostaticSitesReal = constPropReal.electrostaticSites();
+    boolList electrostaticSitesReal = constPropReal.electrostaticSites();
 
-    List<bool> pairPotentialSitesRef = constPropRef.pairPotentialSites();
+    boolList pairPotentialSitesRef = constPropRef.pairPotentialSites();
 
-    List<bool> electrostaticSitesRef = constPropRef.electrostaticSites();
+    boolList electrostaticSitesRef = constPropRef.electrostaticSites();
 
     forAll(siteIdsReal, sReal)
     {
@@ -293,17 +293,17 @@ inline bool Foam::moleculeCloud::evaluatePotentialLimit
 
     const molecule::constantProperties& constPropJ(constProps(idJ));
 
-    List<label> siteIdsI = constPropI.siteIds();
+    labelList siteIdsI = constPropI.siteIds();
 
-    List<label> siteIdsJ = constPropJ.siteIds();
+    labelList siteIdsJ = constPropJ.siteIds();
 
-    List<bool> pairPotentialSitesI = constPropI.pairPotentialSites();
+    boolList pairPotentialSitesI = constPropI.pairPotentialSites();
 
-    List<bool> electrostaticSitesI = constPropI.electrostaticSites();
+    boolList electrostaticSitesI = constPropI.electrostaticSites();
 
-    List<bool> pairPotentialSitesJ = constPropJ.pairPotentialSites();
+    boolList pairPotentialSitesJ = constPropJ.pairPotentialSites();
 
-    List<bool> electrostaticSitesJ = constPropJ.electrostaticSites();
+    boolList electrostaticSitesJ = constPropJ.electrostaticSites();
 
     forAll(siteIdsI, sI)
     {
@@ -436,17 +436,17 @@ inline bool Foam::moleculeCloud::evaluatePotentialLimit
 
     const molecule::constantProperties& constPropRef(constProps(idRef));
 
-    List<label> siteIdsReal = constPropReal.siteIds();
+    labelList siteIdsReal = constPropReal.siteIds();
 
-    List<label> siteIdsRef = constPropRef.siteIds();
+    labelList siteIdsRef = constPropRef.siteIds();
 
-    List<bool> pairPotentialSitesReal = constPropReal.pairPotentialSites();
+    boolList pairPotentialSitesReal = constPropReal.pairPotentialSites();
 
-    List<bool> electrostaticSitesReal = constPropReal.electrostaticSites();
+    boolList electrostaticSitesReal = constPropReal.electrostaticSites();
 
-    List<bool> pairPotentialSitesRef = constPropRef.pairPotentialSites();
+    boolList pairPotentialSitesRef = constPropRef.pairPotentialSites();
 
-    List<bool> electrostaticSitesRef = constPropRef.electrostaticSites();
+    boolList electrostaticSitesRef = constPropRef.electrostaticSites();
 
     forAll(siteIdsReal, sReal)
     {
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
index a7c2d1b6c..9b47f4771 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
@@ -39,7 +39,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "runTimeSelectionTables.H"
 #include "autoPtr.H"
-#include "List.H"
+#include "scalarList.H"
 #include "Pair.H"
 #include "Switch.H"
 #include "mathematicalConstants.H"
@@ -72,8 +72,8 @@ protected:
         scalar rMin_;
         scalar dr_;
 
-        List<scalar> forceLookup_;
-        List<scalar> energyLookup_;
+        scalarList forceLookup_;
+        scalarList energyLookup_;
 
         mutable energyScalingFunction* esfPtr_;
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
index 444aeb664..e434e3d0d 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
@@ -31,7 +31,7 @@ License
 
 void Foam::pairPotentialList::readPairPotentialDict
 (
-    const List<word>& idList,
+    const wordList& idList,
     const dictionary& pairPotentialDict,
     const polyMesh& mesh
 )
@@ -180,7 +180,7 @@ Foam::pairPotentialList::pairPotentialList()
 
 Foam::pairPotentialList::pairPotentialList
 (
-    const List<word>& idList,
+    const wordList& idList,
     const dictionary& pairPotentialDict,
     const polyMesh& mesh
 )
@@ -201,7 +201,7 @@ Foam::pairPotentialList::~pairPotentialList()
 
 void Foam::pairPotentialList::buildPotentials
 (
-    const List<word>& idList,
+    const wordList& idList,
     const dictionary& pairPotentialDict,
     const polyMesh& mesh
 )
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
index 9625a0050..4345e76f7 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
@@ -74,7 +74,7 @@ class pairPotentialList
 
         void readPairPotentialDict
         (
-            const List<word>& idList,
+            const wordList& idList,
             const dictionary& pairPotentialDict,
             const polyMesh& mesh
         );
@@ -95,7 +95,7 @@ public:
         //- Construct from idList and potental dictionaries
         pairPotentialList
         (
-            const List<word>& idList,
+            const wordList& idList,
             const dictionary& pairPotentialDict,
             const polyMesh& mesh
         );
@@ -110,7 +110,7 @@ public:
 
         void buildPotentials
         (
-            const List<word>& idList,
+            const wordList& idList,
             const dictionary& pairPotentialDict,
             const polyMesh& mesh
         );
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index 83a8d5fb6..09e0aac6c 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -46,7 +46,7 @@ void Foam::potential::setSiteIdList(const IOdictionary& moleculePropertiesDict)
 
         const dictionary& molDict(moleculePropertiesDict.subDict(id));
 
-        List<word> siteIdNames = molDict.lookup("siteIds");
+        wordList siteIdNames = molDict.lookup("siteIds");
 
         forAll(siteIdNames, sI)
         {
@@ -58,7 +58,7 @@ void Foam::potential::setSiteIdList(const IOdictionary& moleculePropertiesDict)
             }
         }
 
-        List<word> pairPotSiteIds = molDict.lookup("pairPotentialSiteIds");
+        wordList pairPotSiteIds = molDict.lookup("pairPotentialSiteIds");
 
         forAll(pairPotSiteIds, sI)
         {
@@ -110,7 +110,7 @@ void Foam::potential::potential::readPotentialDict()
         )
     );
 
-    idList_ = List<word>(idListDict.lookup("idList"));
+    idList_ = wordList(idListDict.lookup("idList"));
 
     IOdictionary moleculePropertiesDict
     (
@@ -127,7 +127,7 @@ void Foam::potential::potential::readPotentialDict()
 
     setSiteIdList(moleculePropertiesDict);
 
-    List<word> pairPotentialSiteIdList
+    wordList pairPotentialSiteIdList
     (
         SubList<word>(siteIdList_, nPairPotIds_)
     );
@@ -137,11 +137,11 @@ void Foam::potential::potential::readPotentialDict()
         << pairPotentialSiteIdList
         << endl;
 
-    List<word> tetherSiteIdList(0);
+    wordList tetherSiteIdList(0);
 
     if (idListDict.found("tetherSiteIdList"))
     {
-        tetherSiteIdList = List<word>(idListDict.lookup("tetherSiteIdList"));
+        tetherSiteIdList = wordList(idListDict.lookup("tetherSiteIdList"));
     }
 
     IOdictionary potentialDict
@@ -163,7 +163,7 @@ void Foam::potential::potential::readPotentialDict()
 
     if (potentialDict.found("removalOrder"))
     {
-        List<word> remOrd = potentialDict.lookup("removalOrder");
+        wordList remOrd = potentialDict.lookup("removalOrder");
 
         removalOrder_.setSize(remOrd.size());
 
@@ -277,7 +277,7 @@ void Foam::potential::potential::readMdInitialiseDict
             mdInitialiseDict.toc()[zone]
         );
 
-        List<word> latticeIds
+        wordList latticeIds
         (
             zoneDict.lookup("latticeIds")
         );
@@ -302,7 +302,7 @@ void Foam::potential::potential::readMdInitialiseDict
             }
         }
 
-        List<word> tetherSiteIds
+        wordList tetherSiteIds
         (
             zoneDict.lookup("tetherSiteIds")
         );
@@ -322,7 +322,7 @@ void Foam::potential::potential::readMdInitialiseDict
 
                 const word& id = latticeIds[i];
 
-                List<word> siteIds
+                wordList siteIds
                 (
                     moleculePropertiesDict.subDict(id).lookup("siteIds")
                 );
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.H b/src/lagrangian/molecularDynamics/potential/potential/potential.H
index 901ac7693..accb21e37 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.H
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.H
@@ -57,9 +57,9 @@ class potential
 
         const polyMesh& mesh_;
 
-        List<word> idList_;
+        wordList idList_;
 
-        List<word> siteIdList_;
+        wordList siteIdList_;
 
         label nPairPotIds_;
 
@@ -120,9 +120,9 @@ public:
 
             inline label nIds() const;
 
-            inline const List<word>& idList() const;
+            inline const wordList& idList() const;
 
-            inline const List<word>& siteIdList() const;
+            inline const wordList& siteIdList() const;
 
             inline scalar potentialEnergyLimit() const;
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
index ac7333c66..abd6f1333 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
@@ -29,15 +29,15 @@ License
 
 void Foam::tetherPotentialList::readTetherPotentialDict
 (
-    const List<word>& siteIdList,
+    const wordList& siteIdList,
     const dictionary& tetherPotentialDict,
-    const List<word>& tetherSiteIdList
+    const wordList& tetherSiteIdList
 )
 {
 
     Info<< nl << "Building tether potentials." << endl;
 
-    idMap_ = List<label>(siteIdList.size(), -1);
+    idMap_ = labelList(siteIdList.size(), -1);
 
     label tetherMapIndex = 0;
 
@@ -92,9 +92,9 @@ Foam::tetherPotentialList::tetherPotentialList()
 
 Foam::tetherPotentialList::tetherPotentialList
 (
-    const List<word>& siteIdList,
+    const wordList& siteIdList,
     const dictionary& tetherPotentialDict,
-    const List<word>& tetherSiteIdList
+    const wordList& tetherSiteIdList
 )
 :
     PtrList<tetherPotential>(),
@@ -114,9 +114,9 @@ Foam::tetherPotentialList::~tetherPotentialList()
 
 void Foam::tetherPotentialList::buildPotentials
 (
-    const List<word>& siteIdList,
+    const wordList& siteIdList,
     const dictionary& tetherPotentialDict,
-    const List<word>& tetherSiteIdList
+    const wordList& tetherSiteIdList
 )
 {
     setSize(tetherSiteIdList.size());
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
index c9789d3fe..0c2c23f73 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
@@ -54,7 +54,7 @@ class tetherPotentialList
 {
     // Private data
 
-        List<label> idMap_;
+        labelList idMap_;
 
 
     // Private Member Functions
@@ -66,9 +66,9 @@ class tetherPotentialList
 
         void readTetherPotentialDict
         (
-            const List<word>& siteIdList,
+            const wordList& siteIdList,
             const dictionary& tetherPotentialDict,
-            const List<word>& tetherSiteIdList
+            const wordList& tetherSiteIdList
         );
 
         //- Disallow default bitwise assignment
@@ -87,9 +87,9 @@ public:
         //- Construct from siteIdList and potental dictionaries
         tetherPotentialList
         (
-            const List<word>& siteIdList,
+            const wordList& siteIdList,
             const dictionary& tetherPotentialDict,
-            const List<word>& tetherSiteIdList
+            const wordList& tetherSiteIdList
         );
 
 
@@ -102,14 +102,14 @@ public:
 
         void buildPotentials
         (
-            const List<word>& siteIdList,
+            const wordList& siteIdList,
             const dictionary& tetherPotentialDict,
-            const List<word>& tetherSiteIdList
+            const wordList& tetherSiteIdList
         );
 
         // Access
 
-            inline const List<word>& idMap() const;
+            inline const wordList& idMap() const;
 
             const tetherPotential& tetherPotentialFunction(const label a) const;
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index d10b087d2..813604ecd 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -1799,7 +1799,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
             meshPoints,
             nPointFaces,
             plusEqOp<label>(),
-            0,                  // null value
+            label(0),           // null value
             false               // no separation
         );
 
@@ -2292,7 +2292,7 @@ void Foam::autoLayerDriver::setupLayerInfoTruncation
             pp.meshPoints(),
             nPatchPointLayers,
             maxEqOp<label>(),
-            0,                  // null value
+            label(0),           // null value
             false               // no separation
         );
     }
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index a420dc059..64067423c 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -589,7 +589,7 @@ void Foam::autoLayerDriver::findIsolatedRegions
         pp.meshPoints(),
         isolatedPoint,
         plusEqOp<label>(),
-        0,       // null value
+        label(0), // null value
         false    // no separation
     );
 
@@ -734,7 +734,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
             meshPoints,
             nPointFaces,
             plusEqOp<label>(),
-            0,                  // null value
+            label(0),           // null value
             false               // no separation
         );
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index c1c2e252d..ded39743c 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -290,7 +290,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
         pp.meshPoints(),
         nBoundary,
         plusEqOp<label>(),  // combine op
-        0,                  // null value
+        label(0),           // null value
         false               // no separation
     );
 
@@ -385,7 +385,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
             mesh,
             globalNum,
             plusEqOp<label>(),  // combine op
-            0,                  // null value
+            label(0),           // null value
             false               // no separation
         );
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 0035b1714..c9c3b838e 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -1959,7 +1959,7 @@ void Foam::meshRefinement::updateMesh
     );
 
     // Update surfaceIndex
-    updateList(map.faceMap(), -1, surfaceIndex_);
+    updateList(map.faceMap(), label(-1), surfaceIndex_);
 
     // Update cached intersection information
     updateIntersections(changedFaces);
@@ -1972,7 +1972,7 @@ void Foam::meshRefinement::updateMesh
         if (userFaceData_[i].first() == KEEPALL)
         {
             // extend list with face-from-face data
-            updateList(map.faceMap(), -1, data);
+            updateList(map.faceMap(), label(-1), data);
         }
         else if (userFaceData_[i].first() == MASTERONLY)
         {
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index adb5a1213..f02b64a03 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -687,7 +687,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::filterDuplicateFaces
         mesh_,
         nBafflesPerEdge,
         plusEqOp<label>(),  // in-place add
-        0,                  // initial value
+        label(0),           // initial value
         false               // no separation
     );
 
@@ -1830,7 +1830,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
             mesh_,
             pointBaffle,
             maxEqOp<label>(),
-            -1,                 // null value
+            label(-1),          // null value
             false               // no separation
         );
 
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
index 86692a6bc..3e5152b4e 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
@@ -498,7 +498,7 @@ void extrudeLayer::createNewVertices()
 
             DynList<label> edgeGroup;
             edgeGroup.setSize(dEdges.size());
-            edgeGroup = -1;
+            edgeGroup = label(-1);
 
             //- check edge connections and store all edges which can be reached
             //- over other edges into the same group
@@ -538,7 +538,7 @@ void extrudeLayer::createNewVertices()
             //- find face groups from the groups assigned to dual edges
             DynList<label> faceGroups;
             faceGroups.setSize(pointFaces.sizeOfRow(pointI));
-            faceGroups = -1;
+            faceGroups = label(-1);
 
             forAllRow(pointFaces, pointI, pfI)
             {
@@ -618,7 +618,7 @@ void extrudeLayer::createNewVertices()
         //- assign groups to faces and cells
         DynList<label> faceGroup;
         faceGroup.setSize(pointFaces.sizeOfRow(pointI));
-        faceGroup = -1;
+        faceGroup = label(-1);
 
         label group(0);
 
@@ -1114,7 +1114,7 @@ void extrudeLayer::createLayerCells()
         //- find labels of points
         DynList<label> origFacePoints;
         origFacePoints.setSize(pointFaces.sizeOfRow(pointI));
-        origFacePoints = -1;
+        origFacePoints = label(-1);
 
         forAllRow(pointFaces, pointI, pfI)
         {
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersCells.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersCells.C
index fffca87f1..ae5d1bd05 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersCells.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersCells.C
@@ -885,7 +885,7 @@ void refineBoundaryLayers::refineCornerHexCell::generateNewPoints()
         forAll(cellPoints_[i], j)
         {
             cellPoints_[i][j].setSize(nLayersK_+1);
-            cellPoints_[i][j] = -1;
+            cellPoints_[i][j] = label(-1);
         }
     }
 
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
index 40cf3a866..8d8888435 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
@@ -250,7 +250,7 @@ void refineBoundaryLayers::refineFace
     forAll(facePoints, i)
     {
         facePoints[i].setSize(nLayersDir1+1);
-        facePoints[i] = -1;
+        facePoints[i] = label(-1);
     }
 
     //- add points in the matrix
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFunctions.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFunctions.C
index b39b6b1ec..6594e8225 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFunctions.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFunctions.C
@@ -269,7 +269,7 @@ bool refineBoundaryLayers::analyseLayers()
         {
             if( allZMin[patchI] ^ allZMax[patchI] )
             {
-                nLayersAtPatch[patchI] = -1;
+                nLayersAtPatch[patchI] = label(-1);
                 layerAtPatch_[patchI].clear();
             }
         }
@@ -599,7 +599,7 @@ void refineBoundaryLayers::generateNewVertices()
     //- on edges of the mesh
     DynList<label> numPointsAtThread;
     numPointsAtThread.setSize(nThreads);
-    numPointsAtThread = 0;
+    numPointsAtThread = label(0);
 
     # ifdef USE_OMP
     # pragma omp parallel for num_threads(nThreads) schedule(static, 1)
diff --git a/src/mesh/cfMesh/utilities/containers/DynList/DynList.H b/src/mesh/cfMesh/utilities/containers/DynList/DynList.H
index 1b550836b..c022d2096 100644
--- a/src/mesh/cfMesh/utilities/containers/DynList/DynList.H
+++ b/src/mesh/cfMesh/utilities/containers/DynList/DynList.H
@@ -100,6 +100,11 @@ public:
         //- Construct given size
         explicit inline DynList(const label);
 
+#if WM_LABEL_SIZE == 64
+        //- Construct given size
+        explicit inline DynList(const int);
+#endif
+
         //- Construct from given size and defualt value
         explicit inline DynList(const label, const T&);
 
diff --git a/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H b/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H
index f73f5cea7..f048b78bf 100644
--- a/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H
+++ b/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H
@@ -102,6 +102,17 @@ inline Foam::DynList<T, staticSize>::DynList(const label s)
     setSize(s);
 }
 
+#if WM_LABEL_SIZE == 64
+template<class T, Foam::label staticSize>
+inline Foam::DynList<T, staticSize>::DynList(const int s)
+:
+    UList<T>(staticData_, staticSize),
+    nextFree_(0)
+{
+    setSize(s);
+}
+#endif
+
 template<class T, Foam::label staticSize>
 inline Foam::DynList<T, staticSize>::DynList(const label s, const T& val)
 :
diff --git a/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C
index 669e4d737..3094f2fb1 100644
--- a/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C
+++ b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C
@@ -23,7 +23,7 @@ License
 
 Description
 
-\*----------------------p-----------------------------------------------------*/
+\*---------------------------------------------------------------------------*/
 
 #include "decomposeCells.H"
 #include "helperFunctions.H"
@@ -56,7 +56,7 @@ void decomposeCells::findAddressingForCell
     forAll(faceEdges, feI)
     {
         faceEdges[feI].setSize(faces[c[feI]].size());
-        faceEdges[feI] = -1;
+        faceEdges[feI] = label(-1);
     }
 
     forAll(c, fI)
diff --git a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsFrontalMarking.C b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsFrontalMarking.C
index 0c39b5c8c..fd505374f 100644
--- a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsFrontalMarking.C
+++ b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsFrontalMarking.C
@@ -316,7 +316,7 @@ label groupMarking
     //- ones into a new group
     DynList<label> globalGroupLabel;
     globalGroupLabel.setSize(nGroups);
-    globalGroupLabel = -1;
+    globalGroupLabel = label(-1);
 
     //- reduce the information about the groups
     label counter(0);
diff --git a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
index 0c52e7f54..3ea74ec8d 100644
--- a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
+++ b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
@@ -1056,7 +1056,7 @@ inline bool doTrianglesOverlap
         x /= (mag(x) + VSMALL);
         vector y = vec ^ x;
 
-        DynList<point2D, 6> poly2D(3);
+        DynList<point2D, 6> poly2D(label(3));
         poly2D[0] = point2D((tri0.a() - origin) & x, (tri0.a() - origin) & y);
         poly2D[1] = point2D((tri0.b() - origin) & x, (tri0.b() - origin) & y);
         poly2D[2] = point2D((tri0.c() - origin) & x, (tri0.c() - origin) & y);
diff --git a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsTopologyManipulationI.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsTopologyManipulationI.H
index 93f39ad17..7c28a74c5 100644
--- a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsTopologyManipulationI.H
+++ b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsTopologyManipulationI.H
@@ -467,7 +467,7 @@ inline void zipOpenChain(DynList<edge>& bEdges)
 {
     //- close the chain if open
     DynList<label> chainVertices;
-    List<label> nAppearances;
+    labelList nAppearances;
     forAll(bEdges, eI)
     {
         const edge& e = bEdges[eI];
@@ -488,7 +488,7 @@ inline void zipOpenChain(DynList<edge>& bEdges)
     }
 
     bool closed(true);
-    DynList<label> openVertices(2);
+    DynList<label> openVertices(label(2));
     forAll(chainVertices, pI)
         if( nAppearances[pI] == 1 )
         {
diff --git a/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C
index 2d8376294..6e4d12d95 100644
--- a/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C
+++ b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C
@@ -351,7 +351,7 @@ void partTriMesh::createBufferLayers()
         {
             const parTriFace& tri = receivedTrias[i];
 
-            DynList<label, 3> triPointLabels(3);
+            DynList<label, 3> triPointLabels(label(3));
             for(label j=0;j<3;++j)
             {
                 const label gpI = tri.globalLabelOfPoint(j);
diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C
index cc7d120e4..58d786dd9 100644
--- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C
+++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C
@@ -133,7 +133,7 @@ void meshOctree::setOctantVectorsAndPositions()
     //- set vrtLeavesPos_
     for(label vrtI=0;vrtI<8;++vrtI)
     {
-        FixedList<label, 3> vc(0);
+        FixedList<label, 3> vc(label(0));
 
         if( vrtI & 1 )
             vc[0] += 1;
diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C
index c18c1e232..5d9d42cac 100644
--- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C
+++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C
@@ -135,7 +135,7 @@ void meshOctreeAutomaticRefinement::setMaxRefLevel()
         {
             finished = false;
 
-            const scalar lSize = size / pow(2, label(maxRefLevel_));
+            const scalar lSize = size / pow(2.0, label(maxRefLevel_));
 
             if( lSize < cs )
             {
diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C
index 89df24880..f0c824fb1 100644
--- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C
+++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C
@@ -84,12 +84,12 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters()
     {
         finished = false;
 
-        const scalar lSize = size / Foam::pow(2, label(globalRefLevel_));
+        const scalar lSize = size / pow(label(2), label(globalRefLevel_));
 
         if( lSize < (maxSize * (1.0-SMALL)) )
         {
             const scalar bbSize =
-                0.5 * maxSize * Foam::pow(2, label(globalRefLevel_));
+                0.5 * maxSize * pow(label(2), label(globalRefLevel_));
             rootBox.max() = c + point(bbSize, bbSize, bbSize);
             rootBox.min() = c - point(bbSize, bbSize, bbSize);
             finished = true;
@@ -133,7 +133,7 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters()
         {
             finished = false;
 
-            const scalar lSize = maxSize / Foam::pow(2, addLevel);
+            const scalar lSize = maxSize / Foam::pow(label(2), addLevel);
 
             if( lSize <= cs )
             {
@@ -230,7 +230,7 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters()
             {
                 finished = false;
 
-                const scalar lSize = maxSize / Foam::pow(2, addLevel);
+                const scalar lSize = maxSize / Foam::pow(label(2), addLevel);
 
                 if( lSize <= cs )
                 {
@@ -308,7 +308,7 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters()
             {
                 finished = false;
 
-                const scalar lSize = maxSize / Foam::pow(2, addLevel);
+                const scalar lSize = maxSize / Foam::pow(label(2), addLevel);
 
                 if( lSize <= cs )
                 {
@@ -380,7 +380,7 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters()
                     {
                         finished = false;
 
-                        const scalar lSize = maxSize / Foam::pow(2, nLevel);
+                        const scalar lSize = maxSize / Foam::pow(label(2), nLevel);
 
                         if( lSize <= cs )
                         {
diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesI.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesI.H
index c06c70dc3..9fdb60da2 100644
--- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesI.H
+++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesI.H
@@ -97,7 +97,7 @@ inline meshOctreeCubeCoordinates meshOctreeCubeCoordinates::refineForPosition
 ) const
 {
     //- create new boxes in z-order fashion
-    FixedList<label, 3> addPos(0);
+    FixedList<label, 3> addPos(label(0));
     if( i & 1 )
         addPos[0] = 1;
     if( i & 2 )
diff --git a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionEdges.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionEdges.C
index 99be1ec55..7a8aadd62 100644
--- a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionEdges.C
+++ b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionEdges.C
@@ -50,7 +50,7 @@ void meshUntangler::cutRegion::findNewEdges()
     const DynList<edge, 128>& edges = *edgesPtr_;
 
     newEdgeLabel_.setSize(edges.size());
-    newEdgeLabel_ = -1;
+    newEdgeLabel_ = label(-1);
 
     forAll(edges, eI)
     {
diff --git a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C
index f6e814c6c..c0dbc1083 100644
--- a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C
+++ b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C
@@ -72,7 +72,7 @@ void meshUntangler::cutRegion::findNewFaces()
                 << " consisting of edges " << f << endl;
             # endif
 
-            pointUsage = 0;
+            pointUsage = label(0);
 
             DynList<label, 8> newFace;
 
@@ -144,7 +144,7 @@ void meshUntangler::cutRegion::findNewFaces()
         //- find edges which form the faceInPlane
         DynList<label, 128> edgeUsage;
         edgeUsage.setSize(cEdges.size());
-        edgeUsage = 0;
+        edgeUsage = label(0);
         forAll(cFaces, fI)
         {
             const DynList<label, 8>& f = cFaces[fI];
diff --git a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionPoints.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionPoints.C
index 17940bf0b..322c30533 100644
--- a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionPoints.C
+++ b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionPoints.C
@@ -58,7 +58,7 @@ bool meshUntangler::cutRegion::findNewVertices
     const DynList<point, 64>& points = *pointsPtr_;
 
     newVertexLabel_.setSize(points.size());
-    newVertexLabel_ = -1;
+    newVertexLabel_ = label(-1);
 
     vertexDistance_.setSize(points.size());
 
@@ -118,7 +118,7 @@ void meshUntangler::cutRegion::removeCoincidentVertices()
     DynList<edge, 128>& edges = *edgesPtr_;
     DynList<label, 64> newLabelForPoint;
     newLabelForPoint.setSize(points.size());
-    newLabelForPoint = -1;
+    newLabelForPoint = label(-1);
 
     bool found(false);
     forAll(points, pI)
@@ -150,7 +150,7 @@ void meshUntangler::cutRegion::removeCoincidentVertices()
     }
 
     //- remove edges which contain the same vertex
-    newEdgeLabel_ = -1;
+    newEdgeLabel_ = label(-1);
     label edgeLabel(0);
 
     cEdgesPtr_ = new DynList<edge, 128>();
diff --git a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionTieBreak.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionTieBreak.C
index bd0b305b3..6e2ba16b9 100644
--- a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionTieBreak.C
+++ b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionTieBreak.C
@@ -83,7 +83,7 @@ void meshUntangler::cutRegion::tieBreak(const DynList<label, 8>& f)
 
     DynList<label, 64> vertexRegion;
     vertexRegion.setSize(fv.size());
-    vertexRegion = 0;
+    vertexRegion = label(0);
 
     label region(1);
     forAll(fv, vI)
@@ -176,7 +176,7 @@ void meshUntangler::cutRegion::tieBreak(const DynList<label, 8>& f)
     //- create new points
     const DynList<point, 64>& points = *pointsPtr_;
     cPtsPtr_ = new DynList<point, 64>();
-    newVertexLabel_ = -1;
+    newVertexLabel_ = label(-1);
     origNumVertices_ = 0;
     forAll(points, pI)
         if( vertexTypes_[pI] )
diff --git a/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
index b633c2f81..6a1ea197f 100644
--- a/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
+++ b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
@@ -1520,7 +1520,7 @@ bool edgeExtractor::checkConcaveEdgeCells()
 
                         DynList<label, 2> nFacesInPatch;
                         nFacesInPatch.setSize(2);
-                        nFacesInPatch = 0;
+                        nFacesInPatch = label(0);
 
                         DynList<bool, 2> hasPatchPoints;
                         hasPatchPoints.setSize(2);
diff --git a/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C
index 004b9123d..a3799b297 100644
--- a/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C
+++ b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C
@@ -211,7 +211,7 @@ void edgeExtractor::faceEvaluator::neiFacesProcs
     const VRWGraph& faceEdges = mse.faceEdges();
 
     neiProcs.setSize(faceEdges.sizeOfRow(bfI));
-    neiProcs = Pstream::myProcNo();
+    neiProcs = label(Pstream::myProcNo());
 
     if( Pstream::parRun() )
     {
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index ffa358efa..3a0c26ab2 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -152,7 +152,7 @@ class PointEdgeWave
         (
             const polyPatch& meshPatch,
             const primitivePatch& patch,
-            const List<label>& patchPointLabels,
+            const labelList& patchPointLabels,
             List<Type>& pointInfo
         ) const;
 
@@ -161,7 +161,7 @@ class PointEdgeWave
         (
             const polyPatch& meshPatch,
             const primitivePatch& patch,
-            const List<label>& patchPointLabels,
+            const labelList& patchPointLabels,
             List<Type>& pointInfo
         ) const;
 
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
index 76f3e2d4e..eebe39732 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
@@ -163,7 +163,7 @@ private:
                 const pointField& end,
 
                 List<segment>& allSegments,
-                List<label>& allSegmentMap
+                labelList& allSegmentMap
             ) const;
 
             //- Split edges, distribute, test and collect.
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 0916791f2..34fc2feef 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -85,7 +85,7 @@ Foam::scalar Foam::searchableSurfacesQueries::tryMorphTet
     const labelList& surfacesToTest,
     const scalar initDistSqr,
     List<vector>& p,
-    List<scalar>& y,
+    scalarList& y,
     vector& pSum,
     const label ihi,
     const scalar fac
@@ -116,7 +116,7 @@ bool Foam::searchableSurfacesQueries::morphTet
     const scalar convergenceDistSqr,
     const label maxIter,
     List<vector>& p,
-    List<scalar>& y
+    scalarList& y
 )
 {
     vector pSum = sum(p);
@@ -733,7 +733,7 @@ Foam::pointIndexHit Foam::searchableSurfacesQueries::facesIntersection
 
 
     // Get the sum of distances (initial evaluation)
-    List<scalar> nearestDist(nearest.size());
+    scalarList nearestDist(nearest.size());
 
     forAll(nearestDist, i)
     {
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.H b/src/meshTools/searchableSurface/searchableSurfacesQueries.H
index 76ded4002..222cf8646 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.H
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.H
@@ -83,7 +83,7 @@ class searchableSurfacesQueries
             const labelList& surfacesToTest,
             const scalar initialDistSqr,
             List<vector>& p,
-            List<scalar>& y,
+            scalarList& y,
             vector& pSum,
             const label ihi,
             const scalar fac
@@ -101,7 +101,7 @@ class searchableSurfacesQueries
             const scalar convergenceDistSqr,
             const label maxIter,
             List<vector>& p,
-            List<scalar>& y
+            scalarList& y
         );
 
         //static void findAllIntersections
diff --git a/src/overset/oversetMesh/oversetFringe/overlapFringe/adaptiveOverlapFringe/adaptiveOverlapFringe.C b/src/overset/oversetMesh/oversetFringe/overlapFringe/adaptiveOverlapFringe/adaptiveOverlapFringe.C
index 188ed59b9..f4924dc53 100644
--- a/src/overset/oversetMesh/oversetFringe/overlapFringe/adaptiveOverlapFringe/adaptiveOverlapFringe.C
+++ b/src/overset/oversetMesh/oversetFringe/overlapFringe/adaptiveOverlapFringe/adaptiveOverlapFringe.C
@@ -91,7 +91,7 @@ void Foam::adaptiveOverlapFringe::suitabilityFractionSlope
     forAllConstIter(FIFOStack<iterationData>, iterHist, it)
     {
         iterSum += it().iteration();
-        iterSquaredSum += pow(it().iteration(), 2);
+        iterSquaredSum += pow(it().iteration(), label(2));
         suitabilitySum += it().suitability();
         iterXSuitabilitySum += it().iteration()*it().suitability();
     }
diff --git a/src/overset/oversetMesh/oversetInterpolation/leastSquareInterpolation/leastSquareInterpolation.C b/src/overset/oversetMesh/oversetInterpolation/leastSquareInterpolation/leastSquareInterpolation.C
index 9456a987f..a2bc8dad4 100644
--- a/src/overset/oversetMesh/oversetInterpolation/leastSquareInterpolation/leastSquareInterpolation.C
+++ b/src/overset/oversetMesh/oversetInterpolation/leastSquareInterpolation/leastSquareInterpolation.C
@@ -86,7 +86,7 @@ void Foam::leastSquareInterpolation::calcAddressing() const
     forAll (addr, addrI)
     {
         // Start from donor cells
-        DynamicList<label> curDonors(polyMesh::facesPerCell_);
+        dynamicLabelList curDonors(polyMesh::facesPerCell_);
 
         curDonors.append(donors[addrI]);
 
diff --git a/src/overset/oversetMesh/oversetMesh/oversetMeshAddressing.C b/src/overset/oversetMesh/oversetMesh/oversetMeshAddressing.C
index bd922b8de..8ca9d3417 100644
--- a/src/overset/oversetMesh/oversetMesh/oversetMeshAddressing.C
+++ b/src/overset/oversetMesh/oversetMesh/oversetMeshAddressing.C
@@ -458,8 +458,8 @@ void Foam::oversetMesh::calcFringeFaces() const
         acCellIndicator[acc[accI]] = accI;
     }
 
-    DynamicList<label> acF(2*acc.size());
-    DynamicList<label> acFC(2*acc.size());
+    dynamicLabelList acF(2*acc.size());
+    dynamicLabelList acFC(2*acc.size());
     DynamicList<bool> acFF(2*acc.size());
 
     const unallocLabelList& owner = mesh().owner();
@@ -554,7 +554,7 @@ void Foam::oversetMesh::calcFringeFaces() const
 
     // Acceptor internal face collection
 
-    DynamicList<label> acInternalF(2*acc.size());
+    dynamicLabelList acInternalF(2*acc.size());
 
     forAll (neighbour, faceI)
     {
@@ -635,8 +635,8 @@ void Foam::oversetMesh::calcHoleFaces() const
         hole[hc[hcI]] = hcI;
     }
 
-    DynamicList<label> hF(2*hc.size());
-    DynamicList<label> hFC(2*hc.size());
+    dynamicLabelList hF(2*hc.size());
+    dynamicLabelList hFC(2*hc.size());
     DynamicList<bool> hFF(2*hc.size());
 
     const unallocLabelList& owner = mesh().owner();
@@ -734,7 +734,7 @@ void Foam::oversetMesh::calcHoleFaces() const
 
     // Hole faces are the ones where both owner and neighbour is a hole
 
-    DynamicList<label> hIF(2*hc.size());
+    dynamicLabelList hIF(2*hc.size());
 
     forAll (neighbour, faceI)
     {
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index b95d42664..26d8cdbd6 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -120,6 +120,8 @@ SourceFiles
 #include "volFieldsFwd.H"
 #include "Switch.H"
 #include "pointFieldFwd.H"
+#include "labelList.H"
+#include "scalarList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -130,8 +132,6 @@ namespace Foam
 class objectRegistry;
 class dictionary;
 class fieldAverageItem;
-template<class Type>
-class List;
 class polyMesh;
 class mapPolyMesh;
 
@@ -173,10 +173,10 @@ protected:
         // Counters
 
             //- Iteration steps counter
-            List<label> totalIter_;
+            labelList totalIter_;
 
             //- Total time counter
-            List<scalar> totalTime_;
+            scalarList totalTime_;
 
 
     // Private Member Functions
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index 2096a323f..296f84db8 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -102,9 +102,9 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
 
     const faceZone& fZone = mesh().faceZones()[zoneId];
 
-    DynamicList<label> faceIds(fZone.size());
-    DynamicList<label> facePatchIds(fZone.size());
-    DynamicList<label> faceSigns(fZone.size());
+    dynamicLabelList faceIds(fZone.size());
+    dynamicLabelList facePatchIds(fZone.size());
+    dynamicLabelList faceSigns(fZone.size());
 
     forAll(fZone, i)
     {
@@ -502,7 +502,7 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
         }
     }
 
-    List<word> orientedFields;
+    wordList orientedFields;
     if (dict.readIfPresent("orientedFields", orientedFields))
     {
         orientedFieldsStart_ = fields_.size();
diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C
index 317d9563c..b2f026637 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.C
+++ b/src/sampling/cuttingPlane/cuttingPlane.C
@@ -114,7 +114,7 @@ void Foam::cuttingPlane::intersectEdges
 (
     const primitiveMesh& mesh,
     const scalarField& dotProducts,
-    List<label>& edgePoint
+    labelList& edgePoint
 )
 {
     // Use the dotProducts to find out the cut edges.
@@ -407,7 +407,7 @@ void Foam::cuttingPlane::remapFaces
     {
         MeshStorage::remapFaces(faceMap);
 
-        List<label> newCutCells(faceMap.size());
+        labelList newCutCells(faceMap.size());
         forAll(faceMap, faceI)
         {
             newCutCells[faceI] = cutCells_[faceMap[faceI]];
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H
index ffdc76e00..98915ee81 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.H
+++ b/src/sampling/cuttingPlane/cuttingPlane.H
@@ -86,7 +86,7 @@ class cuttingPlane
         (
             const primitiveMesh&,
             const scalarField& dotProducts,
-            List<label>& edgePoint
+            labelList& edgePoint
         );
 
         //- Walk circumference of cell, starting from startEdgeI crossing
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index a4e9fe3c4..b7cbe707e 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -79,7 +79,7 @@ void meshToMesh::calcAddressing()
             << "Setting up rescue" << endl;
     }
 
-    List<bool> boundaryCell(fromCells.size(), false);
+    boolList boundaryCell(fromCells.size(), false);
 
     // set reference to boundary
     const polyPatchList& patchesFrom = fromMesh_.boundaryMesh();
@@ -240,7 +240,7 @@ void meshToMesh::cellAddresses
     labelList& cellAddr,
     const pointField& points,
     const fvMesh& fromMesh,
-    const List<bool>& boundaryCell,
+    const boolList& boundaryCell,
     const octree<octreeDataCell>& oc,
     bool forceFind
 ) const
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
index f3269bfec..379a70b4b 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
@@ -103,7 +103,7 @@ class meshToMesh
                 labelList& cells,
                 const pointField& points,
                 const fvMesh& fromMesh,
-                const List<bool>& boundaryCell,
+                const boolList& boundaryCell,
                 const octree<octreeDataCell>& oc,
                 bool forceFind = false
             ) const;
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index b45449ced..a435c958b 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -380,7 +380,7 @@ void Foam::probes::updateMesh(const mapPolyMesh& mpm)
 
         // 1. Update cells
         {
-            DynamicList<label> elems(elementList_.size());
+            dynamicLabelList elems(elementList_.size());
 
             const labelList& reverseMap = mpm.reverseCellMap();
             forAll(elementList_, i)
@@ -408,7 +408,7 @@ void Foam::probes::updateMesh(const mapPolyMesh& mpm)
 
         // 2. Update faces
         {
-            DynamicList<label> elems(faceList_.size());
+            dynamicLabelList elems(faceList_.size());
 
             const labelList& reverseMap = mpm.reverseFaceMap();
             forAll(faceList_, i)
diff --git a/src/solidModels/constitutiveModel/solidInterfaces/solidInterface/solidInterface.C b/src/solidModels/constitutiveModel/solidInterfaces/solidInterface/solidInterface.C
index b0daff82d..403591d89 100644
--- a/src/solidModels/constitutiveModel/solidInterfaces/solidInterface/solidInterface.C
+++ b/src/solidModels/constitutiveModel/solidInterfaces/solidInterface/solidInterface.C
@@ -487,7 +487,7 @@ void solidInterface::makeProcessorPatchFacesMap() const
       new labelListList
       (
        mesh_.boundary().size(),
-       labelList(0,-1)
+       labelList()
        );
     processorPatchMapPtr_  =
       new labelList
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index e97c3098a..a57f35170 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -625,7 +625,7 @@ bool Foam::MeshedSurface<Face>::stitchFaces
 
     List<Face>& faceLst = this->storedFaces();
 
-    List<label> faceMap(faceLst.size());
+    labelList faceMap(faceLst.size());
 
     // Reset the point labels to the unique points array
     label newFaceI = 0;
@@ -685,7 +685,7 @@ bool Foam::MeshedSurface<Face>::checkFaces
     bool changed = false;
     List<Face>& faceLst = this->storedFaces();
 
-    List<label> faceMap(faceLst.size());
+    labelList faceMap(faceLst.size());
 
     label newFaceI = 0;
     // Detect badly labelled faces and mark degenerate faces
@@ -848,7 +848,7 @@ Foam::label Foam::MeshedSurface<Face>::triangulate()
 template<class Face>
 Foam::label Foam::MeshedSurface<Face>::triangulate
 (
-    List<label>& faceMapOut
+    labelList& faceMapOut
 )
 {
     label nTri = 0;
@@ -877,7 +877,7 @@ Foam::label Foam::MeshedSurface<Face>::triangulate
     }
 
     List<Face>  newFaces(nTri);
-    List<label> faceMap;
+    labelList faceMap;
 
     // reuse storage from optional faceMap
     if (!faceMapOut.empty())
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index 04f2e59a4..8ad8be472 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -146,7 +146,7 @@ protected:
         void sortFacesAndStore
         (
             const Xfer< List<Face> >& unsortedFaces,
-            const Xfer< List<label> >& zoneIds,
+            const Xfer< labelList >& zoneIds,
             const bool sorted
         );
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index 00f3ddfec..f8dd0179a 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -71,12 +71,12 @@ template<class Face>
 void Foam::MeshedSurface<Face>::sortFacesAndStore
 (
     const Xfer< List<Face> >& unsortedFaces,
-    const Xfer< List<label> >& zoneIds,
+    const Xfer< labelList >& zoneIds,
     const bool sorted
 )
 {
     List<Face>  oldFaces(unsortedFaces);
-    List<label> zones(zoneIds);
+    labelList zones(zoneIds);
 
     if (sorted)
     {
@@ -87,7 +87,7 @@ void Foam::MeshedSurface<Face>::sortFacesAndStore
     {
         // unsorted - determine the sorted order:
         // avoid SortableList since we discard the main list anyhow
-        List<label> faceMap;
+        labelList faceMap;
         sortedOrder(zones, faceMap);
         zones.clear();
 
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index 9fa787d59..3477c27e5 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -225,7 +225,7 @@ Foam::MeshedSurfaceProxy<Face>::MeshedSurfaceProxy
     const pointField& pointLst,
     const List<Face>& faceLst,
     const List<surfZone>& zoneLst,
-    const List<label>& faceMap
+    const labelList& faceMap
 )
 :
     points_(pointLst),
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
index 9c2ceb7b4..b49f89512 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
@@ -73,7 +73,7 @@ class MeshedSurfaceProxy
 
         const List<surfZone>& zones_;
 
-        const List<label>& faceMap_;
+        const labelList& faceMap_;
 
 
 public:
@@ -98,7 +98,7 @@ public:
             const pointField&,
             const List<Face>&,
             const List<surfZone>& = List<surfZone>(),
-            const List<label>& faceMap = List<label>()
+            const labelList& faceMap = labelList()
         );
 
 
@@ -151,7 +151,7 @@ public:
             }
 
             //- Const access to the faceMap, zero-sized when unused
-            inline const List<label>& faceMap() const
+            inline const labelList& faceMap() const
             {
                 return faceMap_;
             }
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 8e6f78cc5..6846b6d2a 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -159,7 +159,7 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
     const Xfer< pointField >& pointLst,
     const Xfer< List<Face> >& faceLst,
-    const Xfer< List<label> >& zoneIds,
+    const Xfer< labelList >& zoneIds,
     const Xfer< surfZoneIdentifierList >& zoneTofc
 )
 :
@@ -413,7 +413,7 @@ void Foam::UnsortedMeshedSurface<Face>::remapFaces
         }
         else
         {
-            List<label> newZones(faceMap.size());
+            labelList newZones(faceMap.size());
 
             forAll(faceMap, faceI)
             {
@@ -556,7 +556,7 @@ Foam::UnsortedMeshedSurface<Face>::subsetMesh
 
     // Renumber face node labels and compact
     List<Face>  newFaces(faceMap.size());
-    List<label> newZones(faceMap.size());
+    labelList newZones(faceMap.size());
 
     forAll(faceMap, faceI)
     {
@@ -601,7 +601,7 @@ void Foam::UnsortedMeshedSurface<Face>::reset
 (
     const Xfer< pointField >& pointLst,
     const Xfer< List<Face> >& faceLst,
-    const Xfer< List<label> >& zoneIds
+    const Xfer< labelList >& zoneIds
 )
 {
     ParentType::reset
@@ -623,7 +623,7 @@ void Foam::UnsortedMeshedSurface<Face>::reset
 (
     const Xfer< List<point> >& pointLst,
     const Xfer< List<Face> >& faceLst,
-    const Xfer< List<label> >& zoneIds
+    const Xfer< labelList >& zoneIds
 )
 {
     ParentType::reset
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 69257bbb2..2bc153681 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -118,7 +118,7 @@ protected:
     // Protected Member functions
 
         //- Return non-const access to the zone Ids
-        List<label>& storedZoneIds()
+        labelList& storedZoneIds()
         {
             return zoneIds_;
         }
@@ -165,7 +165,7 @@ public:
         (
             const Xfer< pointField >&,
             const Xfer< List<Face> >&,
-            const Xfer< List<label> >& zoneIds,
+            const Xfer< labelList >& zoneIds,
             const Xfer< surfZoneIdentifierList >&
         );
 
@@ -269,7 +269,7 @@ public:
             void setSize(const label);
 
             //- Return const access to the zone ids
-            const List<label>& zoneIds() const
+            const labelList& zoneIds() const
             {
                 return zoneIds_;
             }
@@ -322,7 +322,7 @@ public:
             (
                 const Xfer< pointField >&,
                 const Xfer< List<Face> >&,
-                const Xfer< List<label> >& zoneIds
+                const Xfer< labelList >& zoneIds
             );
 
             //- Transfer components (points, faces, zone ids).
@@ -330,7 +330,7 @@ public:
             (
                 const Xfer< List<point> >&,
                 const Xfer< List<Face> >&,
-                const Xfer< List<label> >& zoneIds
+                const Xfer< labelList >& zoneIds
             );
 
             //- Transfer the contents of the argument and annull the argument
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 66e4ed3c7..641849b12 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -102,8 +102,8 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
 
     DynamicList<point> dynPoints;
     DynamicList<Face>  dynFaces;
-    List<word>         names(nZones);
-    List<label>        sizes(nZones, 0);
+    wordList         names(nZones);
+    labelList        sizes(nZones, 0);
 
     for (label zoneI = 0; zoneI < nZones; ++zoneI)
     {
@@ -206,7 +206,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
 
                     label nVert = parse<int>(args);
 
-                    List<label> verts(nVert);
+                    labelList verts(nVert);
                     forAll(verts, vertI)
                     {
                         is.getLine(line);
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
index 17ca805ce..36bd76c73 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
@@ -69,7 +69,7 @@ bool Foam::fileFormats::FTRsurfaceFormat<Face>::read
     List< Keyed<triFace> > facesRead(is);
 
     List<Face>  faceLst(facesRead.size());
-    List<label> zoneIds(facesRead.size());
+    labelList zoneIds(facesRead.size());
 
     // disentangle faces/keys - already triangulated
     forAll(facesRead, faceI)
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
index 0dc13b2b0..e74b1ae2d 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@@ -80,7 +80,7 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
     // write directly into the lists:
     pointField&  pointLst = this->storedPoints();
     List<Face>&  faceLst  = this->storedFaces();
-    List<label>& zoneIds  = this->storedZoneIds();
+    labelList& zoneIds  = this->storedZoneIds();
 
     pointLst.setSize(nPoints);
     faceLst.setSize(nElems);
@@ -344,7 +344,7 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
 {
     const pointField& pointLst   = surf.points();
     const List<Face>& faceLst    = surf.faces();
-    const List<label>& zoneIds   = surf.zoneIds();
+    const labelList& zoneIds   = surf.zoneIds();
     const List<surfZoneIdentifier>& zoneToc = surf.zoneToc();
 
     // check if output triangulation would be required
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 39aacc6e9..e7d81cdca 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -362,7 +362,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
 
     // create default zone names, or from ANSA/Hypermesh information
-    List<word> names(dynSizes.size());
+    wordList names(dynSizes.size());
     forAllConstIter(Map<label>, lookup, iter)
     {
         const label zoneI  = iter();
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index d22a62873..b9fbd7663 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -219,7 +219,7 @@ void Foam::fileFormats::OBJsurfaceFormat<Face>::write
 {
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     // for no zones, suppress the group name
     const List<surfZone>& zones =
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index 6301c1ab1..7a1462459 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -113,7 +113,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
             label nVerts;
             lineStream >> nVerts;
 
-            List<label> verts(nVerts);
+            labelList verts(nVerts);
 
             forAll(verts, vertI)
             {
@@ -156,7 +156,7 @@ void Foam::fileFormats::OFFsurfaceFormat<Face>::write
 {
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
     const List<surfZone>& zoneLst = surf.surfZones();
 
     OFstream os(filename);
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
index 59bd7e6b1..26ac13346 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
@@ -205,7 +205,7 @@ void Foam::fileFormats::OFSsurfaceFormat<Face>::write
 )
 {
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     OFstream os(filename);
     if (!os.good())
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
index a1ebe5cd4..51bc06e45 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
@@ -47,7 +47,7 @@ void Foam::fileFormats::SMESHsurfaceFormat<Face>::write
 {
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     const List<surfZone>& zones =
     (
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 449d8887d..9db8c9fb4 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -85,7 +85,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
     fileName baseName = filename.lessExt();
 
     // STAR-CD index of points
-    List<label> pointId;
+    labelList pointId;
 
     // read points from .vrt file
     readPoints
@@ -224,7 +224,7 @@ void Foam::fileFormats::STARCDsurfaceFormat<Face>::write
 {
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     const List<surfZone>& zones =
     (
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
index 44acb7ecc..6c0974b42 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@@ -137,9 +137,9 @@ bool Foam::fileFormats::STLsurfaceFormat<Face>::read
     this->storedPoints().transfer(reader.points());
 
     // retrieve the original zone information
-    List<word>  names(reader.names().xfer());
-    List<label> sizes(reader.sizes().xfer());
-    List<label> zoneIds(reader.zoneIds().xfer());
+    wordList  names(reader.names().xfer());
+    labelList sizes(reader.sizes().xfer());
+    labelList zoneIds(reader.zoneIds().xfer());
 
     // generate the (sorted) faces
     List<Face> faceLst(zoneIds.size());
@@ -157,7 +157,7 @@ bool Foam::fileFormats::STLsurfaceFormat<Face>::read
     {
         // unsorted - determine the sorted order:
         // avoid SortableList since we discard the main list anyhow
-        List<label> faceMap;
+        labelList faceMap;
         sortedOrder(zoneIds, faceMap);
 
         // generate sorted faces
@@ -208,7 +208,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeAscii
 
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     const List<surfZone>& zones =
     (
@@ -269,7 +269,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeBinary
 
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     const List<surfZone>& zones =
     (
@@ -406,7 +406,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeBinary
 
     const pointField&  pointLst = surf.points();
     const List<Face>&  faceLst  = surf.faces();
-    const List<label>& zoneIds  = surf.zoneIds();
+    const labelList& zoneIds  = surf.zoneIds();
 
     unsigned int nTris = 0;
     if (MeshedSurface<Face>::isTri())
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
index 25874d4de..4b26bb0a0 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
@@ -62,13 +62,13 @@ class STLsurfaceFormatCore
         pointField points_;
 
         //- The zones associated with the faces
-        List<label> zoneIds_;
+        labelList zoneIds_;
 
         //- The solid names, in the order of their first appearance
-        List<word> names_;
+        wordList names_;
 
         //- The solid count, in the order of their first appearance
-        List<label> sizes_;
+        labelList sizes_;
 
 
     // Private Member Functions
@@ -139,19 +139,19 @@ public:
         }
 
         //- Return full access to the zoneIds
-        List<label>& zoneIds()
+        labelList& zoneIds()
         {
             return zoneIds_;
         }
 
         //- The list of solid names in the order of their first appearance
-        List<word>& names()
+        wordList& names()
         {
             return names_;
         }
 
         //- The list of solid sizes in the order of their first appearance
-        List<label>& sizes()
+        labelList& sizes()
         {
             return sizes_;
         }
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
index 2521869a7..d1b6aaf0b 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@@ -85,8 +85,8 @@ bool Foam::fileFormats::TRIsurfaceFormat<Face>::read
     this->storedPoints().transfer(reader.points());
 
     // retrieve the original zone information
-    List<label> sizes(reader.sizes().xfer());
-    List<label> zoneIds(reader.zoneIds().xfer());
+    labelList sizes(reader.sizes().xfer());
+    labelList zoneIds(reader.zoneIds().xfer());
 
     // generate the (sorted) faces
     List<Face> faceLst(zoneIds.size());
@@ -104,7 +104,7 @@ bool Foam::fileFormats::TRIsurfaceFormat<Face>::read
     {
         // unsorted - determine the sorted order:
         // avoid SortableList since we discard the main list anyhow
-        List<label> faceMap;
+        labelList faceMap;
         sortedOrder(zoneIds, faceMap);
 
         // generate sorted faces
@@ -134,7 +134,7 @@ void Foam::fileFormats::TRIsurfaceFormat<Face>::write
 {
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     const List<surfZone>& zones =
     (
@@ -208,7 +208,7 @@ void Foam::fileFormats::TRIsurfaceFormat<Face>::write
     // a single zone needs no sorting
     if (surf.zoneToc().size() == 1)
     {
-        const List<label>& zoneIds  = surf.zoneIds();
+        const labelList& zoneIds  = surf.zoneIds();
 
         forAll(faceLst, faceI)
         {
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
index 006097ee7..c51965a65 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
@@ -65,10 +65,10 @@ class TRIsurfaceFormatCore
         pointField points_;
 
         //- The zones associated with the faces
-        List<label> zoneIds_;
+        labelList zoneIds_;
 
         //- The solid count, in the order of their first appearance
-        List<label> sizes_;
+        labelList sizes_;
 
 
     // Private Member Functions
@@ -119,13 +119,13 @@ public:
         }
 
         //- Return full access to the zones
-        List<label>& zoneIds()
+        labelList& zoneIds()
         {
             return zoneIds_;
         }
 
         //- The list of zone sizes in the order of their first appearance
-        List<label>& sizes()
+        labelList& sizes()
         {
             return sizes_;
         }
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index f03ae2c32..e795b89d2 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -65,7 +65,7 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
 {
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     const List<surfZone>& zones =
     (
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
index 8eebe8b86..d76b5f138 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
@@ -47,7 +47,7 @@ void Foam::fileFormats::WRLsurfaceFormat<Face>::write
 {
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     // for no zones, suppress the group name
     const List<surfZone>& zones =
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
index 1e692816d..57d2c582b 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
@@ -49,7 +49,7 @@ void Foam::fileFormats::X3DsurfaceFormat<Face>::write
 {
     const pointField& pointLst = surf.points();
     const List<Face>&  faceLst = surf.faces();
-    const List<label>& faceMap = surf.faceMap();
+    const labelList& faceMap = surf.faceMap();
 
     // for no zones, suppress the group name
     const List<surfZone>& zones =
diff --git a/src/tetFiniteElement/tetPolyMesh/MapTetFemFields/tetPolyPatchMapper.C b/src/tetFiniteElement/tetPolyMesh/MapTetFemFields/tetPolyPatchMapper.C
index 0bb2fc0a6..2b7d379ec 100644
--- a/src/tetFiniteElement/tetPolyMesh/MapTetFemFields/tetPolyPatchMapper.C
+++ b/src/tetFiniteElement/tetPolyMesh/MapTetFemFields/tetPolyPatchMapper.C
@@ -142,7 +142,7 @@ void Foam::tetPolyPatchMapper::calcAddressing() const
             }
             else
             {
-                addr[nAddr] = labelList(1, 0);
+                addr[nAddr] = labelList(1, label(0));
             }
 
             w[nAddr] = scalarList(1, 1.0);
diff --git a/src/tetFiniteElement/tetPolyMesh/tetPolyMesh.C b/src/tetFiniteElement/tetPolyMesh/tetPolyMesh.C
index a75145ccc..89a652ed5 100644
--- a/src/tetFiniteElement/tetPolyMesh/tetPolyMesh.C
+++ b/src/tetFiniteElement/tetPolyMesh/tetPolyMesh.C
@@ -116,13 +116,13 @@ tetPolyMesh::~tetPolyMesh()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::tetPolyMesh::comm() const
+int Foam::tetPolyMesh::comm() const
 {
     return comm_;
 }
 
 
-Foam::label& Foam::tetPolyMesh::comm()
+int& Foam::tetPolyMesh::comm()
 {
     return comm_;
 }
diff --git a/src/tetFiniteElement/tetPolyMesh/tetPolyMesh.H b/src/tetFiniteElement/tetPolyMesh/tetPolyMesh.H
index fafe0ee5d..9137d04d4 100644
--- a/src/tetFiniteElement/tetPolyMesh/tetPolyMesh.H
+++ b/src/tetFiniteElement/tetPolyMesh/tetPolyMesh.H
@@ -139,7 +139,7 @@ class tetPolyMesh
         label cellOffset_;
 
         //- Communicator used for parallel communication
-        label comm_;
+        int comm_;
 
 
     // Demand-driven data
@@ -376,10 +376,10 @@ public:
             // Communication support
 
                 //- Return communicator used for parallel communication
-                label comm() const;
+                int comm() const;
 
                 //- Return communicator used for parallel communication
-                label& comm();
+                int& comm();
 
 
         // Edit
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
index a242ad1e2..9003b11d1 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
@@ -103,7 +103,7 @@ class liquidMixture
         static const scalar TrMax;
 
         //- The names of the liquids
-        List<word> components_;
+        wordList components_;
 
         //- The liquid properties
         PtrList<liquid> properties_;
@@ -132,7 +132,7 @@ public:
 
     // Member Functions
 
-        inline const List<word>& components() const
+        inline const wordList& components() const
         {
             return components_;
         }
diff --git a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H
index 9828b4b0b..11cb27224 100644
--- a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H
+++ b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H
@@ -43,6 +43,7 @@ SourceFiles
 #define RosinRammler_H
 
 #include "pdf.H"
+#include "scalarList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,9 +66,9 @@ class RosinRammler
         scalar minValue_;
         scalar maxValue_;
 
-        List<scalar> d_;
-        List<scalar> n_;
-        List<scalar> ls_;
+        scalarList d_;
+        scalarList n_;
+        scalarList ls_;
 
         scalar range_;
 
diff --git a/src/thermophysicalModels/pdfs/exponential/exponential.H b/src/thermophysicalModels/pdfs/exponential/exponential.H
index 56dec80d2..8e5de3403 100644
--- a/src/thermophysicalModels/pdfs/exponential/exponential.H
+++ b/src/thermophysicalModels/pdfs/exponential/exponential.H
@@ -38,6 +38,7 @@ SourceFiles
 #define exponential_H
 
 #include "pdf.H"
+#include "scalarList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,8 +61,8 @@ class exponential
         scalar minValue_;
         scalar maxValue_;
 
-        List<scalar> lambda_;
-        List<scalar> ls_;
+        scalarList lambda_;
+        scalarList ls_;
 
         scalar range_;
 
diff --git a/src/thermophysicalModels/pdfs/normal/normal.H b/src/thermophysicalModels/pdfs/normal/normal.H
index f288f2a74..6fcce563f 100644
--- a/src/thermophysicalModels/pdfs/normal/normal.H
+++ b/src/thermophysicalModels/pdfs/normal/normal.H
@@ -44,6 +44,7 @@ SourceFiles
 #define normal_H
 
 #include "pdf.H"
+#include "scalarList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,9 +67,9 @@ class normal
         scalar minValue_;
         scalar maxValue_;
 
-        List<scalar> expectation_;
-        List<scalar> variance_;
-        List<scalar> strength_;
+        scalarList expectation_;
+        scalarList variance_;
+        scalarList strength_;
 
         scalar range_;
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
index 448a3d715..f4b5cb249 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
@@ -30,7 +30,7 @@ License
 template <class Type>
 Foam::label Foam::interpolationLookUpTable<Type>::index
 (
-    const List<scalar>& indices,
+    const scalarList& indices,
     const bool lastDim
 ) const
 {
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
index caa9b1524..75fcd92cf 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
@@ -69,16 +69,16 @@ private:
         fileName fileName_;
 
         //- Table dimensions
-        List<label> dim_;
+        labelList dim_;
 
         //- Min on each dimension
-        List<scalar> min_;
+        scalarList min_;
 
         //- Deltas on each dimension
-        List<scalar> delta_;
+        scalarList delta_;
 
         //- Maximum on each dimension
-        List<scalar> max_;
+        scalarList max_;
 
         //- Dictionary entries
         List<dictionary> entries_;
@@ -87,16 +87,16 @@ private:
         List<dictionary> output_;
 
         //- Input indices from the look up table
-        List<label> entryIndices_;
+        labelList entryIndices_;
 
         //- Output Indeces from the Look Up Table
-        List<label> outputIndices_;
+        labelList outputIndices_;
 
         //- Field names and indices
         HashTable<label> fieldIndices_;
 
         //- Output list containing input and interpolation values of outputs
-        List<scalar> interpOutput_;
+        scalarList interpOutput_;
 
 
     // Private Member Functions
@@ -108,7 +108,7 @@ private:
         void dimensionTable();
 
         //- Find table index by scalarList
-        label index(const List<scalar>&, const bool lastDim=true) const;
+        label index(const scalarList&, const bool lastDim=true) const;
 
         //- Find table index by scalar
         label index(const scalar) const;
@@ -161,7 +161,7 @@ public:
         bool found(const word& fieldName) const;
 
         //- Return the output list given a single input scalar
-        const List<scalar>& lookUp(const scalar);
+        const scalarList& lookUp(const scalar);
 
         //- Write Look Up Table to filename.
         void write
@@ -185,16 +185,16 @@ public:
         inline const List<dictionary>& entries() const;
 
         //- Return const access to the list of min dimensions
-        inline const List<scalar>& min() const;
+        inline const scalarList& min() const;
 
         //- Return const access to the list of dimensions
-        inline const List<label>& dim() const;
+        inline const labelList& dim() const;
 
         //- Return const access to the deltas in each dimension
-        inline const List<scalar>& delta() const;
+        inline const scalarList& delta() const;
 
         //- Return const access to the list of max dimensions
-        inline const List<scalar>& max() const;
+        inline const scalarList& max() const;
 
         //- Return const access to the table name
         inline word tableName() const;
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index c7f60def3..e8089d41f 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -55,7 +55,7 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
     absorptionEmissionModel(dict, mesh),
     coeffsDict_((dict.subDict(typeName + "Coeffs"))),
     speciesNames_(0),
-    specieIndex_(0),
+    specieIndex_(label(0)),
     lookUpTable_
     (
         fileName(coeffsDict_.lookup("lookUpTableFileName")),
@@ -176,7 +176,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
 
     forAll(a, i)
     {
-        const List<scalar>& species = lookUpTable_.lookUp(ft[i]);
+        const scalarList& species = lookUpTable_.lookUp(ft[i]);
 
         for (label n=0; n<nSpecies; n++)
         {
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index fe9ea2554..83d4fa18b 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -55,7 +55,7 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
     absorptionEmissionModel(dict, mesh),
     coeffsDict_((dict.subDict(typeName + "Coeffs"))),
     speciesNames_(0),
-    specieIndex_(0),
+    specieIndex_(label(0)),
     lookUpTable_
     (
         fileName(coeffsDict_.lookup("lookUpTableFileName")),
@@ -187,7 +187,7 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandI) const
 
     forAll(a, i)
     {
-        const List<scalar>& species = lookUpTable_.lookUp(ft[i]);
+        const scalarList& species = lookUpTable_.lookUp(ft[i]);
 
         for (label n=0; n<nSpecies; n++)
         {
diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
index 8f8889e0e..2c904849a 100644
--- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
+++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
@@ -52,7 +52,7 @@ class solidMixture
     // Private data
 
         //- The names of the solids
-        List<word> components_;
+        wordList components_;
 
         //- The solid properties
         PtrList<solid> properties_;
@@ -81,7 +81,7 @@ public:
     // Member Functions
 
         //- Return the sold names
-        inline const List<word>& components() const
+        inline const wordList& components() const
         {
             return components_;
         }
diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/aungierRedlichKwong/aungierRedlichKwongI.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/aungierRedlichKwong/aungierRedlichKwongI.H
index fba6e600e..9deff9c40 100755
--- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/aungierRedlichKwong/aungierRedlichKwongI.H
+++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/aungierRedlichKwong/aungierRedlichKwongI.H
@@ -460,7 +460,7 @@ inline scalar aungierRedlichKwong::rho
                -(
                    (this->p((this->W()/molarVolumePrevIteration),T) - p)
                    /(this->dpdv((this->W()/molarVolumePrevIteration), T))
-               )/pow(2,i);
+               )/pow(2.0,i);
 
            i++;
            if (i>8)
diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinsonI.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinsonI.H
index dbd776019..143497873 100755
--- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinsonI.H
+++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinsonI.H
@@ -430,7 +430,7 @@ inline scalar pengRobinson::rho
                -(
                    (this->p((this->W()/molarVolumePrevIteration),T) - p)
                    /(this->dpdv((this->W()/molarVolumePrevIteration), T))
-               )/pow(2,i);
+               )/pow(2.0,i);
 
            i++;
            if (i>8)
diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwongI.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwongI.H
index 448af5e2b..3fdcb94c1 100755
--- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwongI.H
+++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwongI.H
@@ -332,7 +332,7 @@ inline scalar redlichKwong::rho
                -(
                    (this->p((this->W()/molarVolumePrevIteration),T) - p)
                    /(this->dpdv((this->W()/molarVolumePrevIteration), T))
-               )/pow(2,i);
+               )/pow(2.0,i);
 
            i++;
            if (i>8)
diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwongI.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwongI.H
index ba1c0b112..fb09298f6 100755
--- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwongI.H
+++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwongI.H
@@ -411,7 +411,7 @@ inline scalar soaveRedlichKwong::rho
                -(
                    (this->p((this->W()/molarVolumePrevIteration),T) - p)
                    /(this->dpdv((this->W()/molarVolumePrevIteration), T))
-               )/pow(2,i);
+               )/pow(2.0,i);
 
            i++;
            if (i>8)
diff --git a/src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H b/src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H
index 9ead2a485..67e31c38b 100755
--- a/src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H
@@ -76,7 +76,7 @@ inline void Foam::realGasSpecieThermo<thermo>::T
         {
             //CL: using a stabilizing newton solver
             //CL: if the solve is diverging, the step is reduced until the solver converges
-            Tnew = Test - ((this->*F)(rho, Test) - f)/(this->*dFdT)(rho, Test)/(pow(2, i));
+            Tnew = Test - ((this->*F)(rho, Test) - f)/(this->*dFdT)(rho, Test)/(pow(2.0, i));
             i++;
         } while
         (
@@ -89,7 +89,7 @@ inline void Foam::realGasSpecieThermo<thermo>::T
             )
         );
 
-        if (iter++ > maxIter_)
+        if (iter++ > maxIter_())
         {
             FatalErrorIn
             (
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
index ee955e82d..0d956eb7a 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
@@ -54,10 +54,10 @@ class regionProperties
     // Private data
 
         //- List of the fluid region names
-        List<word> fluidRegionNames_;
+        wordList fluidRegionNames_;
 
         //- List of the solid region names
-        List<word> solidRegionNames_;
+        wordList solidRegionNames_;
 
 
     // Private Member Functions
@@ -87,10 +87,10 @@ public:
         // Access
 
             //- Return const reference to the list of fluid region names
-            const List<word>& fluidRegionNames() const;
+            const wordList& fluidRegionNames() const;
 
             //- Return const reference to the list of solid region names
-            const List<word>& solidRegionNames() const;
+            const wordList& solidRegionNames() const;
 };