diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index 198783c4e6f12f1aa898e0d35c4fb059d9a0a854..6aeea6e097d584a801ad427155ea6d4d2a4546c9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -45,8 +45,8 @@ namespace Foam
 
 class phaseModel;
 class phasePair;
-template <class ThermoType> class pureMixture;
-template <class ThermoType> class multiComponentMixture;
+template<class ThermoType> class pureMixture;
+template<class ThermoType> class multiComponentMixture;
 
 /*---------------------------------------------------------------------------*\
                          Class InterfaceCompositionModel Declaration
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
index 296201ddba544bb9e5d54117d1b0ef135ad42575..550c0d104397d3f31437d9b7ef393c4083eb6c9c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
@@ -43,7 +43,7 @@ SourceFiles
 namespace Foam
 {
 
-template <class modelType>
+template<class modelType>
 class BlendedInterfacialModel;
 
 class blendingMethod;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
index 480433d18982b091cb591b7773175de1b7f1b723..d313aa7e657bcd6db1c5161755a8ca1ae91e40da 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 class blendingMethod;
-template <class modelType> class BlendedInterfacialModel;
+template<class modelType> class BlendedInterfacialModel;
 class heatTransferModel;
 
 /*---------------------------------------------------------------------------*\
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index 49a0bfb642ffce35cc60af151ac770bf4de3decd..e6a3209f1c5f11a055d2230924793df2fd5997fc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
@@ -47,7 +47,7 @@ SourceFiles
 namespace Foam
 {
 
-template <class modelType>
+template<class modelType>
 class BlendedInterfacialModel;
 
 class blendingMethod;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 85470192a111185df4b151af3a66f06c07c8d76b..9bfaebd9f7ac29b013c5c8d64c677f1ddb0e2b7c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -57,7 +57,7 @@ namespace Foam
 {
 
 class blendingMethod;
-template <class modelType> class BlendedInterfacialModel;
+template<class modelType> class BlendedInterfacialModel;
 class surfaceTensionModel;
 class aspectRatioModel;
 
@@ -320,11 +320,11 @@ public:
         inline fv::options& fvOptions() const;
 
         //- Access a sub model between a phase pair
-        template <class modelType>
+        template<class modelType>
         const modelType& lookupSubModel(const phasePair& key) const;
 
         //- Access a sub model between two phases
-        template <class modelType>
+        template<class modelType>
         const modelType& lookupSubModel
         (
             const phaseModel& dispersed,
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
index 3ac0019faba4a2d924526eb2b4a6a230477397c4..3ab4a91ec5b2533ad258904f8aab0733ce2e16a3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
@@ -182,7 +182,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
     }
 }
 
-template <class modelType>
+template<class modelType>
 const modelType& Foam::phaseSystem::lookupSubModel(const phasePair& key) const
 {
     return
@@ -193,7 +193,7 @@ const modelType& Foam::phaseSystem::lookupSubModel(const phasePair& key) const
 }
 
 
-template <class modelType>
+template<class modelType>
 const modelType& Foam::phaseSystem::lookupSubModel
 (
     const phaseModel& dispersed,
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
index 2355c0bf746c372e794740d37262d924e2c90cc9..225bf34f620c4fa8e8bd1a62588789ef524ca230 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
@@ -54,7 +54,7 @@ class wallLubricationModel;
 class turbulentDispersionModel;
 
 class blendingMethod;
-template <class modelType> class BlendedInterfacialModel;
+template<class modelType> class BlendedInterfacialModel;
 
 /*---------------------------------------------------------------------------*\
                       Class twoPhaseSystem Declaration
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H
index 17a50f699908ba6be3c10c27af1a49c24a17b302..dc4cadfaf16580fabed019a166a0af94f00f8c42 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ namespace DelaunayMeshTools
 
     //- Write Delaunay points in the range between (and including)
     //  type startPointType and endPointType to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeOBJ
     (
         const fileName& fName,
@@ -85,7 +85,7 @@ namespace DelaunayMeshTools
     );
 
     //- Write Delaunay points of type pointType to .obj file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeOBJ
     (
         const fileName& fName,
@@ -94,15 +94,15 @@ namespace DelaunayMeshTools
     );
 
     //- Write the fixed Delaunay points to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeFixedPoints(const fileName& fName, const Triangulation& t);
 
     //- Write the boundary Delaunay points to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeBoundaryPoints(const fileName& fName, const Triangulation& t);
 
     //- Write the processor interface to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeProcessorInterface
     (
         const fileName& fName,
@@ -112,7 +112,7 @@ namespace DelaunayMeshTools
 
     //- Write the internal Delaunay vertices of the tessellation as a
     //  pointField that may be used to restart the meshing process
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeInternalDelaunayVertices
     (
         const fileName& instance,
@@ -121,14 +121,14 @@ namespace DelaunayMeshTools
 
     //- Draws a tet cell to an output stream. The offset is supplied as the tet
     //  number to be drawn.
-    template<typename CellHandle>
+    template<class CellHandle>
     void drawDelaunayCell(Ostream& os, const CellHandle& c, label offset = 0);
 
 
 // Field extraction
 
     //- Extract all points in vertex-index order
-    template<typename Triangulation>
+    template<class Triangulation>
     tmp<pointField> allPoints(const Triangulation& t);
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
index 143241f858371304f16a3723826b75662c47bf40..ed6818dd39bff6e1984ee7a509fe56f7da9a614b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
@@ -32,7 +32,7 @@ License
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeOBJ
 (
     const fileName& fName,
@@ -77,7 +77,7 @@ void Foam::DelaunayMeshTools::writeOBJ
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeOBJ
 (
     const fileName& fName,
@@ -89,7 +89,7 @@ void Foam::DelaunayMeshTools::writeOBJ
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeFixedPoints
 (
     const fileName& fName,
@@ -117,7 +117,7 @@ void Foam::DelaunayMeshTools::writeFixedPoints
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeBoundaryPoints
 (
     const fileName& fName,
@@ -145,7 +145,7 @@ void Foam::DelaunayMeshTools::writeBoundaryPoints
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeProcessorInterface
 (
     const fileName& fName,
@@ -175,7 +175,7 @@ void Foam::DelaunayMeshTools::writeProcessorInterface
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
 (
     const fileName& instance,
@@ -224,7 +224,7 @@ void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
 }
 
 
-template<typename CellHandle>
+template<class CellHandle>
 void Foam::DelaunayMeshTools::drawDelaunayCell
 (
     Ostream& os,
@@ -273,7 +273,7 @@ void Foam::DelaunayMeshTools::drawDelaunayCell
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 Foam::tmp<Foam::pointField> Foam::DelaunayMeshTools::allPoints
 (
     const Triangulation& t
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 60701acbb8403ac10e26fedaf2a990cb522afedb..a539ddcff26b5b3bb4798cc9f3ad9381c2f1feda 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -225,7 +225,7 @@ public:
         );
 
         //- Distribute supplied the points to the appropriate processor
-        template<typename PointType>
+        template<class PointType>
         autoPtr<mapDistribute> distributePoints(List<PointType>& points) const;
 
         //- Is the given position inside the domain of this decomposition
@@ -263,7 +263,7 @@ public:
         ) const;
 
         //- What processor is the given position on?
-        template<typename PointType>
+        template<class PointType>
         labelList processorPosition(const List<PointType>& pts) const;
 
         //- What is the nearest processor to the given position?
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
index b63321076203d941eedca71b5f37f2a04583ff44..5851c7e807d87f380beebd10fcdd68dc183caf77 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<typename PointType>
+template<class PointType>
 Foam::autoPtr<Foam::mapDistribute>
 Foam::backgroundMeshDecomposition::distributePoints
 (
@@ -45,7 +45,7 @@ Foam::backgroundMeshDecomposition::distributePoints
 }
 
 
-template<typename PointType>
+template<class PointType>
 Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
 (
     const List<PointType>& pts
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
index f3b964b3f307e7efbba1ab41e615792f5e0ab60b..7fc602c1393e4e36cc9e9d51713b50aed27ec12b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
@@ -119,7 +119,7 @@ public:
     typedef typename Cb::Vertex_handle                   Vertex_handle;
     typedef typename Cb::Cell_handle                     Cell_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Cb::template Rebind_TDS<TDS2>::Other Cb2;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
index 86512ac92e530a62af1672171040459a2ff23d87..49f6796781d235b8690a6a41819850e32a65cf06 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 #include "CGALTriangulation3DKernel.H"
 
 
-template<typename Cell>
+template<class Cell>
 Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
 (
     Cell& c,
@@ -74,7 +74,7 @@ Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
 }
 
 
-template<typename Cell>
+template<class Cell>
 bool Foam::foamyHexMeshChecks::closePoints
 (
     Cell& c,
@@ -104,7 +104,7 @@ bool Foam::foamyHexMeshChecks::closePoints
 }
 
 
-template<typename Cell>
+template<class Cell>
 bool Foam::foamyHexMeshChecks::smallVolume
 (
     Cell& c,
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
index 1aa31c3dbeac0780c7c18bf693a88ea9732b80f1..39385f4561b4d31051b9dad257cd4e5d78d5c0a7 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,21 +34,21 @@ namespace Foam
 namespace foamyHexMeshChecks
 {
 
-    template<typename Cell>
+    template<class Cell>
     scalar coplanarTet
     (
         Cell& c,
         const scalar tol = 1e-12
     );
 
-    template<typename Cell>
+    template<class Cell>
     bool closePoints
     (
         Cell& c,
         const scalar tol = 1e-12
     );
 
-    template<typename Cell>
+    template<class Cell>
     bool smallVolume
     (
         Cell& c,
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
index 6620b8de574251140db588fb7fd7d89d8d3f26b7..8efb99a44d3383f5eef86df33720d78ff0a82abb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,10 @@ namespace indexedCellOps
 {
 
 //- Does the Dual vertex form part of a processor patch
-template<typename CellType>
+template<class CellType>
 Foam::label dualVertexMasterProc(const CellType& c);
 
-template<typename CellType>
+template<class CellType>
 Foam::FixedList<Foam::label, 4> processorsAttached(const CellType& c);
 
 } // End namespace indexedCellOps
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C
index 9222339396610961b622fb9e793189bcd1d9af7a..e5841b65b8caa159cbb3cc5b432229f6e6b30cb1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-template<typename CellType>
+template<class CellType>
 Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
 {
     if (!c->parallelDualVertex())
@@ -56,7 +56,7 @@ Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
 }
 
 
-template<typename CellType>
+template<class CellType>
 Foam::FixedList<Foam::label, 4>
 CGAL::indexedCellOps::processorsAttached(const CellType& c)
 {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
index 3cbc6acbc890c50feaf2bcb68845d380981b0edf..d6d8dd9601699b3c4558070f4d8e0b067038de50 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
@@ -134,7 +134,7 @@ public:
     typedef typename Tds::Vertex_handle                 Vertex_handle;
     typedef typename Tds::Cell_handle                   Cell_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Vb::template Rebind_TDS<TDS2>::Other   Vb2;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
index 657275c618bae72732a85cdd84ad9d1525bec813..99fdea0e9ca8d4e7142ab7f665c328c81ac20e37 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,11 +50,11 @@ namespace indexedVertexOps
 
 //- Return the target cell size from that stored on a pair of Delaunay vertices,
 //  using a mean function.
-template<typename VertexType>
+template<class VertexType>
 Foam::scalar averageCellSize(const VertexType& vA, const VertexType& vB);
 
 
-template<typename VertexType>
+template<class VertexType>
 inline bool uninitialised(const VertexType& v);
 
 } // End namespace indexedVertexOps
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C
index 1b28a88c5e6b295cd942131a2b08d6b9ae95beed..5cb2fd96cad6db02ae3646012fd1c6b05ab126e0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-template<typename VertexType>
+template<class VertexType>
 Foam::scalar CGAL::indexedVertexOps::averageCellSize
 (
     const VertexType& vA,
@@ -47,7 +47,7 @@ Foam::scalar CGAL::indexedVertexOps::averageCellSize
 }
 
 
-template<typename VertexType>
+template<class VertexType>
 inline bool CGAL::indexedVertexOps::uninitialised(const VertexType& v)
 {
     return v->type() == Foam::indexedVertexEnum::vtUnassigned;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
index 509a8f7a7f6edca3dbd20feaa3df9464fa305ebe..570f32aee03bf0822e7946f61feedc1cc5059aa2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
@@ -54,7 +54,7 @@ namespace Foam
 
 #ifdef CGAL_INEXACT
 
-    template<typename Point>
+    template<class Point>
     inline pointFromPoint topoint(const Point& P)
     {
         return reinterpret_cast<pointFromPoint>(P);
@@ -67,7 +67,7 @@ namespace Foam
 
 #else
 
-    template<typename Point>
+    template<class Point>
     inline pointFromPoint topoint(const Point& P)
     {
         return Foam::point
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
index 71449770403acb6ac6d2fd6ce232ce56b53217ce..a4593e2eb6f7dad482f78638d41a2a15d47bf032 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ namespace vectorTools
     //- Test if a and b are parallel: a^b = 0
     //  Uses the cross product, so the tolerance is proportional to
     //  the sine of the angle between a and b in radians
-    template<typename T>
+    template<class T>
     bool areParallel
     (
         const Vector<T>& a,
@@ -67,7 +67,7 @@ namespace vectorTools
     //- Test if a and b are orthogonal: a.b = 0
     //  Uses the dot product, so the tolerance is proportional to
     //  the cosine of the angle between a and b in radians
-    template<typename T>
+    template<class T>
     bool areOrthogonal
     (
         const Vector<T>& a,
@@ -79,7 +79,7 @@ namespace vectorTools
     }
 
     //- Test if angle between a and b is acute: a.b > 0
-    template<typename T>
+    template<class T>
     bool areAcute
     (
         const Vector<T>& a,
@@ -90,7 +90,7 @@ namespace vectorTools
     }
 
     //- Test if angle between a and b is obtuse: a.b < 0
-    template<typename T>
+    template<class T>
     bool areObtuse
     (
         const Vector<T>& a,
@@ -101,7 +101,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in radians
-    template<typename T>
+    template<class T>
     T cosPhi
     (
         const Vector<T>& a,
@@ -116,7 +116,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in radians
-    template<typename T>
+    template<class T>
     T radAngleBetween
     (
         const Vector<T>& a,
@@ -131,7 +131,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in degrees
-    template<typename T>
+    template<class T>
     T degAngleBetween
     (
         const Vector<T>& a,
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
index 07dc30ea4290bd1f49dede90cdac2931acf87bc9..df02689057c32fd0cfb44fde26e4bc35f6c3975e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
@@ -70,7 +70,7 @@ public:
     typedef typename Fb::Vertex_handle                   Vertex_handle;
     typedef typename Fb::Face_handle                     Face_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Fb::template Rebind_TDS<TDS2>::Other Fb2;
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
index 3c100372df9b44f115e87086103bc33973b41bb5..c6f7512b5554ac178aed9c314b26d0743691bb29 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
@@ -105,7 +105,7 @@ public:
     typedef typename Vb::Face_handle        Face_handle;
     typedef typename Vb::Point              Point;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Vb::template Rebind_TDS<TDS2>::Other    Vb2;
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index 1935c6fa67056c93a87e24e1bf62c3e38031c5ad..2951b10d23cece0da982ffea39e150618e198bff 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -142,7 +142,7 @@ class domainDecomposition
         ) const;
 
         //- Generate sub patch info for processor cyclics
-        template <class BinaryOp>
+        template<class BinaryOp>
         void processInterCyclics
         (
             const polyBoundaryMesh& patches,
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
index 5122d628d7a77265443e5a2e67f1f46893b11148..b12668ff1e3e5666ebf13daa5c7e5a37dbacc42c 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
@@ -27,7 +27,7 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template <class BinaryOp>
+template<class BinaryOp>
 void Foam::domainDecomposition::processInterCyclics
 (
     const polyBoundaryMesh& patches,
diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h b/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h
index 1c19f0d99c4405b4bfaee87e9659bb1517b7d23d..225496ef2fca1b4ab8b603a34ed42a71db74bb27 100644
--- a/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h
+++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h
@@ -9,7 +9,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-template <class Type> class List {
+template<class Type> class List {
         public:
                 List(int s=0);
                 ~List();
@@ -30,7 +30,7 @@ template <class Type> class List {
 };
 
 
-template <class Type>
+template<class Type>
 List<Type>::List(int s){
         num=0;
         array_size = 0;
@@ -40,12 +40,12 @@ List<Type>::List(int s){
         }
 }
 
-template <class Type>
+template<class Type>
 List<Type>::~List(){
         delete element;
 }
 
-template <class Type>
+template<class Type>
 void List<Type>::allocate(int s){
         assert(s>0);
         assert(s>=num);
@@ -58,18 +58,18 @@ void List<Type>::allocate(int s){
         }
         if(old) delete old;
 }
-template <class Type>
+template<class Type>
 void List<Type>::SetSize(int s){
         if(s==0) { if(element) delete element;}
         else {  allocate(s); }
         num=s;
 }
-template <class Type>
+template<class Type>
 void List<Type>::Pack(){
         allocate(num);
 }
 
-template <class Type>
+template<class Type>
 void List<Type>::Add(Type t){
         assert(num<=array_size);
         if(num==array_size) {
@@ -83,7 +83,7 @@ void List<Type>::Add(Type t){
         element[num++] = t;
 }
 
-template <class Type>
+template<class Type>
 int List<Type>::Contains(Type t){
         int i;
         int count=0;
@@ -93,13 +93,13 @@ int List<Type>::Contains(Type t){
         return count;
 }
 
-template <class Type>
+template<class Type>
 void List<Type>::AddUnique(Type t){
         if(!Contains(t)) Add(t);
 }
 
 
-template <class Type>
+template<class Type>
 void List<Type>::DelIndex(int i){
         assert(i<num);
         num--;
@@ -109,7 +109,7 @@ void List<Type>::DelIndex(int i){
         }
 }
 
-template <class Type>
+template<class Type>
 void List<Type>::Remove(Type t){
         int i;
         for(i=0;i<num;i++) {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index abae46e9debb2887e6bd1f7b4338acfab7fe966a..d501f3d44301733f5928ae26a242ba6598a1b4fb 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -123,7 +123,7 @@ public:
             );
 
             //- Like above but switches between linear/tree communication
-            template <class T>
+            template<class T>
             static void scatter
             (
                 T& Value,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
index 323dc8d3c3d1fde75913057fa6f1d2ecf3aca4ba..345e766aea8a937155efc2049216901d8ec042a8 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
@@ -134,7 +134,7 @@ void Foam::Pstream::combineGather
 }
 
 
-template <class T, class CombineOp>
+template<class T, class CombineOp>
 void Foam::Pstream::combineGather
 (
     T& Value,
@@ -249,7 +249,7 @@ void Foam::Pstream::combineScatter
 }
 
 
-template <class T>
+template<class T>
 void Foam::Pstream::combineScatter
 (
     T& Value,
@@ -484,7 +484,7 @@ void Foam::Pstream::listCombineScatter
 }
 
 
-template <class T>
+template<class T>
 void Foam::Pstream::listCombineScatter
 (
     List<T>& Values,
@@ -667,7 +667,7 @@ void Foam::Pstream::mapCombineScatter
 }
 
 
-template <class Container>
+template<class Container>
 void Foam::Pstream::mapCombineScatter
 (
     Container& Values,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
index 477dbe35f540b57b6bef16449b7cf0d9c3ba2ae4..50a3b7660ebe4c85770a1c71b30074f506c1d816 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ void Pstream::gather
 }
 
 
-template <class T, class BinaryOp>
+template<class T, class BinaryOp>
 void Pstream::gather
 (
     T& Value,
@@ -217,7 +217,7 @@ void Pstream::scatter
 }
 
 
-template <class T>
+template<class T>
 void Pstream::scatter(T& Value, const int tag, const label comm)
 {
     if (UPstream::nProcs(comm) < UPstream::nProcsSimpleSum)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
index a016eee530f92cac8e532bff4635bf96a712dc32..930a51bc85868afcf9ca029ed0344bf9196c9122 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ void Pstream::gatherList
 }
 
 
-template <class T>
+template<class T>
 void Pstream::gatherList(List<T>& Values, const int tag, const label comm)
 {
     if (UPstream::nProcs(comm) < UPstream::nProcsSimpleSum)
@@ -321,7 +321,7 @@ void Pstream::scatterList
 }
 
 
-template <class T>
+template<class T>
 void Pstream::scatterList(List<T>& Values, const int tag, const label comm)
 {
     if (UPstream::nProcs(comm) < UPstream::nProcsSimpleSum)
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index a0dfdc6d2339330f77101adf8366ad8bc3b607e4..b1add8e8c3afb9cad7cec960550c2c83cb46b04d 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -372,7 +372,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
 
 
 //- Return the const reference of the non-const reference argument
-template<typename T>
+template<class T>
 inline const T& Const(T& t)
 {
     return t;
@@ -380,7 +380,7 @@ inline const T& Const(T& t)
 
 
 //- Return the const reference of the non-const rvalue reference argument
-template<typename T>
+template<class T>
 inline const T& Const(T&& t)
 {
     return t;
diff --git a/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H b/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
index b56a4c4407ae4682dfe218401b389e85163fef48..75f66f44e8a5dd109e0f4ea1736c9ec29fe0170f 100644
--- a/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
+++ b/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
@@ -302,7 +302,7 @@ inline void Foam::tmpNrc<T>::operator=(const tmpNrc<T>& t)
 
 
 //- Return the const reference of the non-const reference argument
-template<typename T>
+template<class T>
 inline const T& Const(T& t)
 {
     return t;
@@ -310,7 +310,7 @@ inline const T& Const(T& t)
 
 
 //- Return the const reference of the non-const rvalue reference argument
-template<typename T>
+template<class T>
 inline const T& Const(T&& t)
 {
     return t;
diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.H b/src/OpenFOAM/primitives/nullObject/nullObject.H
index 1ec31d5341ac5f212506e5c43944885090391afb..71217836c15561f8ed76f5e25e72ea68f92ee1b6 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObject.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObject.H
@@ -69,29 +69,29 @@ extern const NullObject* nullObjectPtr;
 
 
 //- Return reference to the nullObject of type T
-template <class T>
+template<class T>
 inline const T& NullObjectRef();
 
 //- Return pointer to the nullObject of type T
-template <class T>
+template<class T>
 inline const T* NullObjectPtr();
 
 
 //- Return true if t is a reference to the nullObject of type T
-template <class T>
+template<class T>
 inline bool isNull(const T& t);
 
 //- Return true if t is not a reference to the nullObject of type T
-template <class T>
+template<class T>
 inline bool notNull(const T& t);
 
 
 //- Return true if t is a pointer to the nullObject of type T
-template <class T>
+template<class T>
 inline bool isNull(const T* t);
 
 //- Return true if t is not a pointer to the nullObject of type T
-template <class T>
+template<class T>
 inline bool notNull(const T* t);
 
 
diff --git a/src/OpenFOAM/primitives/nullObject/nullObjectI.H b/src/OpenFOAM/primitives/nullObject/nullObjectI.H
index 4f8fbc1f731402da896f4ee968aa091679922ccf..727de5838b995ba466b5070ea2f42139bd2474d2 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObjectI.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObjectI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,39 +23,39 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-template <class T>
+template<class T>
 inline const T& Foam::NullObjectRef()
 {
     return *reinterpret_cast<const T*>(nullObjectPtr);
 }
 
-template <class T>
+template<class T>
 inline const T* Foam::NullObjectPtr()
 {
     return reinterpret_cast<const T*>(nullObjectPtr);
 }
 
 
-template <class T>
+template<class T>
 inline bool Foam::isNull(const T& t)
 {
     return &t == NullObjectPtr<T>();
 }
 
-template <class T>
+template<class T>
 inline bool Foam::notNull(const T& t)
 {
     return &t != NullObjectPtr<T>();
 }
 
 
-template <class T>
+template<class T>
 inline bool Foam::isNull(const T* t)
 {
     return t == NullObjectPtr<T>();
 }
 
-template <class T>
+template<class T>
 inline bool Foam::notNull(const T* t)
 {
     return t != NullObjectPtr<T>();
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
index a49d6f63f98863a22b1ee5c917bc5b5781439aaa..ffe92dc8997f5f5f2f555909cccda2db9c10ec06 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
@@ -89,10 +89,10 @@ class polyMeshFilter
 
     // Private Member Functions
 
-        template<typename T>
+        template<class T>
         static void updateSets(const mapPolyMesh& map);
 
-        template<typename T>
+        template<class T>
         static void copySets(const polyMesh& oldMesh, const polyMesh& newMesh);
 
         label filterFacesLoop(const label nOriginalBadFaces);
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
index 08fa9d6efe8d9845da689754878b68d4350c28d8..98078299e05384f6f800d8fc306404525e0722c2 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 
 // * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * * //
 
-template<typename SetType>
+template<class SetType>
 void Foam::polyMeshFilter::updateSets(const mapPolyMesh& map)
 {
     HashTable<const SetType*> sets =
@@ -66,7 +66,7 @@ void Foam::polyMeshFilter::updateSets(const mapPolyMesh& map)
 }
 
 
-template<typename SetType>
+template<class SetType>
 void Foam::polyMeshFilter::copySets
 (
     const polyMesh& oldMesh,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
index 23115c2588a6805afcd650ef6a4d51a3cdbda4f1..40e30198e662f3f81351f39a8bf7671209939af5 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
@@ -52,7 +52,7 @@ class ParticleStressModel;
 
 class CorrectionLimitingMethod;
 
-template <class Type>
+template<class Type>
 class AveragingMethod;
 
 /*---------------------------------------------------------------------------*\