diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index 3361a89ad..6c1fd5489 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -61,7 +61,7 @@
             (
                 IOobject
                 (
-                    "K",
+                    "Kappa",
                     runTime.timeName(),
                     solidRegions[i],
                     IOobject::MUST_READ,
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceTemplate.C
similarity index 100%
rename from src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.C
rename to src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceTemplate.C
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceTemplate.H
similarity index 100%
rename from src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.H
rename to src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceTemplate.H
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.H
index f6a1e51b4..26277f0d8 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.H
@@ -29,7 +29,7 @@ Typedef
 #ifndef timeActivatedExplicitSource_H
 #define timeActivatedExplicitSource_H
 
-#include "TimeActivatedExplicitSource.H"
+#include "TimeActivatedExplicitSourceTemplate.H"
 #include "TimeActivatedExplicitSourceList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvc.H b/src/finiteVolume/finiteVolume/fvc/fvc.H
index ce315e311..c6bea75b1 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvc.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvc.H
@@ -42,7 +42,7 @@ Description
 #include "fvcAverage.H"
 #include "fvcReconstruct.H"
 #include "fvcDdt.H"
-#include "fvcDDt.H"
+#include "fvcDDtTotal.H"
 #include "fvcD2dt2.H"
 #include "fvcDiv.H"
 #include "fvcFlux.H"
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDDt.C b/src/finiteVolume/finiteVolume/fvc/fvcDDtTotal.C
similarity index 99%
rename from src/finiteVolume/finiteVolume/fvc/fvcDDt.C
rename to src/finiteVolume/finiteVolume/fvc/fvcDDtTotal.C
index 8cc4d167b..a5f2502a7 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDDt.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDDtTotal.C
@@ -26,7 +26,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "fvcDDt.H"
+#include "fvcDDtTotal.H"
 #include "fvcDiv.H"
 #include "fvMesh.H"
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDDt.H b/src/finiteVolume/finiteVolume/fvc/fvcDDtTotal.H
similarity index 100%
rename from src/finiteVolume/finiteVolume/fvc/fvcDDt.H
rename to src/finiteVolume/finiteVolume/fvc/fvcDDtTotal.H
diff --git a/src/foam/algorithms/octree/octree/PointIndexHit.H b/src/foam/algorithms/octree/octree/PointIndexHitTemplate.H
similarity index 100%
rename from src/foam/algorithms/octree/octree/PointIndexHit.H
rename to src/foam/algorithms/octree/octree/PointIndexHitTemplate.H
diff --git a/src/foam/algorithms/octree/octree/pointIndexHit.H b/src/foam/algorithms/octree/octree/pointIndexHit.H
index 7ea46251d..4d13b0703 100644
--- a/src/foam/algorithms/octree/octree/pointIndexHit.H
+++ b/src/foam/algorithms/octree/octree/pointIndexHit.H
@@ -32,7 +32,7 @@ Description
 #define pointIndexHit_H
 
 #include "point.H"
-#include "PointIndexHit.H"
+#include "PointIndexHitTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/PointPatchFields/PointPatchField/PointPatchFieldFunctions.H b/src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldFunctions.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/PointPatchField/PointPatchFieldFunctions.H
rename to src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldFunctions.H
diff --git a/src/foam/fields/PointPatchFields/PointPatchField/PointPatchFieldMapper.H b/src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldMapper.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/PointPatchField/PointPatchFieldMapper.H
rename to src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldMapper.H
diff --git a/src/foam/fields/PointPatchFields/PointPatchField/PointPatchFieldMapperPatchRef.H b/src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldMapperPatchRef.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/PointPatchField/PointPatchFieldMapperPatchRef.H
rename to src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldMapperPatchRef.H
diff --git a/src/foam/fields/PointPatchFields/PointPatchField/PointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldTemplate.C
similarity index 99%
rename from src/foam/fields/PointPatchFields/PointPatchField/PointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldTemplate.C
index cef967ff7..36be4cc6e 100644
--- a/src/foam/fields/PointPatchFields/PointPatchField/PointPatchField.C
+++ b/src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldTemplate.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PointPatchField.H"
+#include "PointPatchFieldTemplate.H"
 #include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/foam/fields/PointPatchFields/PointPatchField/PointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldTemplate.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/PointPatchField/PointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/PointPatchField/PointPatchFieldTemplate.H
diff --git a/src/foam/fields/PointPatchFields/PointPatchField/newPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/PointPatchField/newPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/PointPatchField/newPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/PointPatchField/newPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/basicSymmetry/BasicSymmetryPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/basicSymmetry/BasicSymmetryPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/basicSymmetry/BasicSymmetryPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/basic/basicSymmetry/BasicSymmetryPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/basicSymmetry/BasicSymmetryPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/basic/basicSymmetry/BasicSymmetryPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/basicSymmetry/BasicSymmetryPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/basic/basicSymmetry/BasicSymmetryPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/basic/calculated/CalculatedPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/calculated/CalculatedPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/calculated/CalculatedPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/basic/calculated/CalculatedPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/calculated/CalculatedPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/basic/calculated/CalculatedPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/calculated/CalculatedPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/basic/calculated/CalculatedPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/basic/coupled/CoupledPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/coupled/CoupledPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/coupled/CoupledPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/basic/coupled/CoupledPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/coupled/CoupledPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/basic/coupled/CoupledPointPatchField.H
similarity index 99%
rename from src/foam/fields/PointPatchFields/basic/coupled/CoupledPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/basic/coupled/CoupledPointPatchField.H
index 14f2af1cb..cd3a85443 100644
--- a/src/foam/fields/PointPatchFields/basic/coupled/CoupledPointPatchField.H
+++ b/src/foam/fields/PointPatchFieldTemplates/basic/coupled/CoupledPointPatchField.H
@@ -35,7 +35,7 @@ SourceFiles
 #define CoupledPointPatchField_H
 
 #include "lduInterfaceField.H"
-#include "PointPatchField.H"
+#include "PointPatchFieldTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/PointPatchFields/basic/fixedValue/FixedValuePointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/fixedValue/FixedValuePointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/fixedValue/FixedValuePointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/basic/fixedValue/FixedValuePointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/fixedValue/FixedValuePointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/basic/fixedValue/FixedValuePointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/fixedValue/FixedValuePointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/basic/fixedValue/FixedValuePointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/basic/generic/GenericPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/generic/GenericPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/generic/GenericPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/basic/generic/GenericPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/generic/GenericPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/basic/generic/GenericPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/generic/GenericPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/basic/generic/GenericPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/basic/mixed/MixedPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/mixed/MixedPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/mixed/MixedPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/basic/mixed/MixedPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/mixed/MixedPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/basic/mixed/MixedPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/mixed/MixedPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/basic/mixed/MixedPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/basic/value/ValuePointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/value/ValuePointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/value/ValuePointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/basic/value/ValuePointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/value/ValuePointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/basic/value/ValuePointPatchField.H
similarity index 99%
rename from src/foam/fields/PointPatchFields/basic/value/ValuePointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/basic/value/ValuePointPatchField.H
index 3079c45fb..2e7b60ddf 100644
--- a/src/foam/fields/PointPatchFields/basic/value/ValuePointPatchField.H
+++ b/src/foam/fields/PointPatchFieldTemplates/basic/value/ValuePointPatchField.H
@@ -34,7 +34,7 @@ SourceFiles
 #ifndef ValuePointPatchField_H
 #define ValuePointPatchField_H
 
-#include "PointPatchField.H"
+#include "PointPatchFieldTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/PointPatchFields/basic/zeroGradient/ZeroGradientPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/basic/zeroGradient/ZeroGradientPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/basic/zeroGradient/ZeroGradientPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/basic/zeroGradient/ZeroGradientPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/basic/zeroGradient/ZeroGradientPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/basic/zeroGradient/ZeroGradientPointPatchField.H
similarity index 99%
rename from src/foam/fields/PointPatchFields/basic/zeroGradient/ZeroGradientPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/basic/zeroGradient/ZeroGradientPointPatchField.H
index 1cb813aae..7cab4b2dc 100644
--- a/src/foam/fields/PointPatchFields/basic/zeroGradient/ZeroGradientPointPatchField.H
+++ b/src/foam/fields/PointPatchFieldTemplates/basic/zeroGradient/ZeroGradientPointPatchField.H
@@ -34,7 +34,7 @@ SourceFiles
 #ifndef ZeroGradientPointPatchField_H
 #define ZeroGradientPointPatchField_H
 
-#include "PointPatchField.H"
+#include "PointPatchFieldTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/PointPatchFields/constraint/cyclic/CyclicPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/constraint/cyclic/CyclicPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/cyclic/CyclicPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/constraint/cyclic/CyclicPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/constraint/cyclic/CyclicPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/constraint/cyclic/CyclicPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/cyclic/CyclicPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/constraint/cyclic/CyclicPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/constraint/empty/EmptyPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/constraint/empty/EmptyPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/empty/EmptyPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/constraint/empty/EmptyPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/constraint/empty/EmptyPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/constraint/empty/EmptyPointPatchField.H
similarity index 99%
rename from src/foam/fields/PointPatchFields/constraint/empty/EmptyPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/constraint/empty/EmptyPointPatchField.H
index 3383c4674..e4e0dcc97 100644
--- a/src/foam/fields/PointPatchFields/constraint/empty/EmptyPointPatchField.H
+++ b/src/foam/fields/PointPatchFieldTemplates/constraint/empty/EmptyPointPatchField.H
@@ -34,7 +34,7 @@ SourceFiles
 #ifndef EmptyPointPatchField_H
 #define EmptyPointPatchField_H
 
-#include "PointPatchField.H"
+#include "PointPatchFieldTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/constraint/processor/ProcessorPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/constraint/processor/ProcessorPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/constraint/processor/ProcessorPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/constraint/processor/ProcessorPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/constraint/symmetry/SymmetryPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/constraint/symmetry/SymmetryPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/symmetry/SymmetryPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/constraint/symmetry/SymmetryPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/constraint/symmetry/SymmetryPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/constraint/symmetry/SymmetryPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/symmetry/SymmetryPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/constraint/symmetry/SymmetryPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/constraint/wedge/WedgePointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/constraint/wedge/WedgePointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/wedge/WedgePointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/constraint/wedge/WedgePointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/constraint/wedge/WedgePointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/constraint/wedge/WedgePointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/constraint/wedge/WedgePointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/constraint/wedge/WedgePointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/derived/componentMixed/ComponentMixedPointPatchVectorField.C b/src/foam/fields/PointPatchFieldTemplates/derived/componentMixed/ComponentMixedPointPatchVectorField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/componentMixed/ComponentMixedPointPatchVectorField.C
rename to src/foam/fields/PointPatchFieldTemplates/derived/componentMixed/ComponentMixedPointPatchVectorField.C
diff --git a/src/foam/fields/PointPatchFields/derived/componentMixed/ComponentMixedPointPatchVectorField.H b/src/foam/fields/PointPatchFieldTemplates/derived/componentMixed/ComponentMixedPointPatchVectorField.H
similarity index 99%
rename from src/foam/fields/PointPatchFields/derived/componentMixed/ComponentMixedPointPatchVectorField.H
rename to src/foam/fields/PointPatchFieldTemplates/derived/componentMixed/ComponentMixedPointPatchVectorField.H
index e294d78d8..5f176f8ce 100644
--- a/src/foam/fields/PointPatchFields/derived/componentMixed/ComponentMixedPointPatchVectorField.H
+++ b/src/foam/fields/PointPatchFieldTemplates/derived/componentMixed/ComponentMixedPointPatchVectorField.H
@@ -39,7 +39,7 @@ SourceFiles
 #ifndef ComponentMixedPointPatchVectorField_H
 #define ComponentMixedPointPatchVectorField_H
 
-#include "PointPatchField.H"
+#include "PointPatchFieldTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/PointPatchFields/derived/global/GlobalPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/derived/global/GlobalPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/global/GlobalPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/derived/global/GlobalPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/derived/global/GlobalPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/derived/global/GlobalPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/global/GlobalPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/derived/global/GlobalPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/derived/oscillatingFixedValue/OscillatingFixedValuePointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/derived/oscillatingFixedValue/OscillatingFixedValuePointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/oscillatingFixedValue/OscillatingFixedValuePointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/derived/oscillatingFixedValue/OscillatingFixedValuePointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/derived/oscillatingFixedValue/OscillatingFixedValuePointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/derived/oscillatingFixedValue/OscillatingFixedValuePointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/oscillatingFixedValue/OscillatingFixedValuePointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/derived/oscillatingFixedValue/OscillatingFixedValuePointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/derived/slip/SlipPointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/derived/slip/SlipPointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/slip/SlipPointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/derived/slip/SlipPointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/derived/slip/SlipPointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/derived/slip/SlipPointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/slip/SlipPointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/derived/slip/SlipPointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/derived/timeVaryingUniformFixedValue/TimeVaryingUniformFixedValuePointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/derived/timeVaryingUniformFixedValue/TimeVaryingUniformFixedValuePointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/timeVaryingUniformFixedValue/TimeVaryingUniformFixedValuePointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/derived/timeVaryingUniformFixedValue/TimeVaryingUniformFixedValuePointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/derived/timeVaryingUniformFixedValue/TimeVaryingUniformFixedValuePointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/derived/timeVaryingUniformFixedValue/TimeVaryingUniformFixedValuePointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/timeVaryingUniformFixedValue/TimeVaryingUniformFixedValuePointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/derived/timeVaryingUniformFixedValue/TimeVaryingUniformFixedValuePointPatchField.H
diff --git a/src/foam/fields/PointPatchFields/derived/uniformFixedValue/UniformFixedValuePointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/derived/uniformFixedValue/UniformFixedValuePointPatchField.C
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/uniformFixedValue/UniformFixedValuePointPatchField.C
rename to src/foam/fields/PointPatchFieldTemplates/derived/uniformFixedValue/UniformFixedValuePointPatchField.C
diff --git a/src/foam/fields/PointPatchFields/derived/uniformFixedValue/UniformFixedValuePointPatchField.H b/src/foam/fields/PointPatchFieldTemplates/derived/uniformFixedValue/UniformFixedValuePointPatchField.H
similarity index 100%
rename from src/foam/fields/PointPatchFields/derived/uniformFixedValue/UniformFixedValuePointPatchField.H
rename to src/foam/fields/PointPatchFieldTemplates/derived/uniformFixedValue/UniformFixedValuePointPatchField.H
diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolation.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolation.C
index 847e00c90..35b42de23 100644
--- a/src/foam/interpolations/GGIInterpolation/GGIInterpolation.C
+++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolation.C
@@ -33,7 +33,7 @@ Contributor:
 
 \*---------------------------------------------------------------------------*/
 
-#include "GGIInterpolation.H"
+#include "GGIInterpolationTemplate.H"
 #include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationName.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationName.C
index 9ddd699f0..750f3e47f 100644
--- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationName.C
+++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationName.C
@@ -32,7 +32,7 @@ Contributor:
 
 \*---------------------------------------------------------------------------*/
 
-#include "GGIInterpolation.H"
+#include "GGIInterpolationTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolation.H b/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H
similarity index 100%
rename from src/foam/interpolations/GGIInterpolation/GGIInterpolation.H
rename to src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H
diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C
index b91decf5c..368ff75e4 100644
--- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C
+++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C
@@ -33,7 +33,7 @@ Modification by:
 
 \*---------------------------------------------------------------------------*/
 
-#include "GGIInterpolation.H"
+#include "GGIInterpolationTemplate.H"
 #include "objectHit.H"
 #include "boolList.H"
 #include "DynamicList.H"
diff --git a/src/foam/interpolations/GGIInterpolation/ggiInterpolation.H b/src/foam/interpolations/GGIInterpolation/ggiInterpolation.H
index 4d07d3be3..d369f3353 100644
--- a/src/foam/interpolations/GGIInterpolation/ggiInterpolation.H
+++ b/src/foam/interpolations/GGIInterpolation/ggiInterpolation.H
@@ -35,7 +35,7 @@ Description
 #ifndef ggiInterpolation_H
 #define ggiInterpolation_H
 
-#include "GGIInterpolation.H"
+#include "GGIInterpolationTemplate.H"
 #include "PrimitivePatch.H"
 #include "face.H"
 #include "SubList.H"
diff --git a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationAddressing.C b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationAddressing.C
index 84a8215ad..9460916ad 100644
--- a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationAddressing.C
+++ b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationAddressing.C
@@ -33,7 +33,7 @@ Contributor
 
 \*---------------------------------------------------------------------------*/
 
-#include "MixingPlaneInterpolation.H"
+#include "MixingPlaneInterpolationTemplate.H"
 #include "demandDrivenData.H"
 #include "PrimitivePatch.H"
 #include "IOmanip.H"
diff --git a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationName.C b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationName.C
index 10ab2e84d..7fce1df8f 100644
--- a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationName.C
+++ b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationName.C
@@ -32,7 +32,7 @@ Contributor
 
 \*---------------------------------------------------------------------------*/
 
-#include "MixingPlaneInterpolation.H"
+#include "MixingPlaneInterpolationTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationPatches.C b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationPatches.C
index bb538df85..90560e97a 100644
--- a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationPatches.C
+++ b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationPatches.C
@@ -33,7 +33,7 @@ Contributor
 
 \*---------------------------------------------------------------------------*/
 
-#include "MixingPlaneInterpolation.H"
+#include "MixingPlaneInterpolationTemplate.H"
 #include "demandDrivenData.H"
 #include "PrimitivePatch.H"
 #include "IOmanip.H"
diff --git a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolation.C b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationTemplate.C
similarity index 99%
rename from src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolation.C
rename to src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationTemplate.C
index 6c0bfbee9..25b8c15c6 100644
--- a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolation.C
+++ b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationTemplate.C
@@ -33,7 +33,7 @@ Contributor
 
 \*---------------------------------------------------------------------------*/
 
-#include "MixingPlaneInterpolation.H"
+#include "MixingPlaneInterpolationTemplate.H"
 #include "demandDrivenData.H"
 #include "PrimitivePatch.H"
 #include "IOmanip.H"
diff --git a/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolation.H b/src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationTemplate.H
similarity index 100%
rename from src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolation.H
rename to src/foam/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolationTemplate.H
diff --git a/src/foam/interpolations/MixingPlaneInterpolation/mixingPlaneInterpolation.H b/src/foam/interpolations/MixingPlaneInterpolation/mixingPlaneInterpolation.H
index e88f6d010..77f8040ae 100644
--- a/src/foam/interpolations/MixingPlaneInterpolation/mixingPlaneInterpolation.H
+++ b/src/foam/interpolations/MixingPlaneInterpolation/mixingPlaneInterpolation.H
@@ -38,7 +38,7 @@ Description
 #ifndef mixingPlaneInterpolation_H
 #define mixingPlaneInterpolation_H
 
-#include "MixingPlaneInterpolation.H"
+#include "MixingPlaneInterpolationTemplate.H"
 #include "PrimitivePatch.H"
 #include "face.H"
 #include "SubList.H"
diff --git a/src/foam/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/foam/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index a0978d6a5..96cca7f46 100644
--- a/src/foam/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/foam/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PatchToPatchInterpolation.H"
+#include "PatchToPatchInterpolationTemplate.H"
 #include "objectHit.H"
 #include "pointHit.H"
 
diff --git a/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolation.C b/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolationTemplate.C
similarity index 98%
rename from src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolation.C
rename to src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolationTemplate.C
index 1d110b07e..46e0a6dd0 100644
--- a/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolation.C
+++ b/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolationTemplate.C
@@ -27,7 +27,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "IOPatchToPatchInterpolation.H"
+#include "IOPatchToPatchInterpolationTemplate.H"
 #include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolation.H b/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolationTemplate.H
similarity index 100%
rename from src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolation.H
rename to src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOPatchToPatchInterpolationTemplate.H
diff --git a/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOpatchToPatchInterpolation.H b/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOpatchToPatchInterpolation.H
index e5b9bb462..b675a18f9 100644
--- a/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOpatchToPatchInterpolation.H
+++ b/src/foam/interpolations/patchToPatchInterpolation/IOpatchToPatchInterpolation/IOpatchToPatchInterpolation.H
@@ -31,7 +31,7 @@ Description
 #ifndef IOpatchToPatchInterpolation_H
 #define IOpatchToPatchInterpolation_H
 
-#include "IOPatchToPatchInterpolation.H"
+#include "IOPatchToPatchInterpolationTemplate.H"
 #include "PrimitivePatch.H"
 #include "face.H"
 #include "SubList.H"
diff --git a/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationName.C b/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationName.C
index 00055bf7a..aa5db8354 100644
--- a/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationName.C
+++ b/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationName.C
@@ -25,7 +25,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "PatchToPatchInterpolation.H"
+#include "PatchToPatchInterpolationTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C b/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationTemplate.C
similarity index 99%
rename from src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
rename to src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationTemplate.C
index 078799058..00e9b6cca 100644
--- a/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
+++ b/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationTemplate.C
@@ -27,7 +27,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "PatchToPatchInterpolation.H"
+#include "PatchToPatchInterpolationTemplate.H"
 #include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationTemplate.H
similarity index 100%
rename from src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
rename to src/foam/interpolations/patchToPatchInterpolation/PatchToPatchInterpolationTemplate.H
diff --git a/src/foam/interpolations/patchToPatchInterpolation/patchToPatchInterpolation.H b/src/foam/interpolations/patchToPatchInterpolation/patchToPatchInterpolation.H
index 88addd1c5..17cfd96a4 100644
--- a/src/foam/interpolations/patchToPatchInterpolation/patchToPatchInterpolation.H
+++ b/src/foam/interpolations/patchToPatchInterpolation/patchToPatchInterpolation.H
@@ -26,7 +26,7 @@ License
 #ifndef patchToPatchInterpolation_H
 #define patchToPatchInterpolation_H
 
-#include "PatchToPatchInterpolation.H"
+#include "PatchToPatchInterpolationTemplate.H"
 #include "PrimitivePatch.H"
 #include "face.H"
 #include "SubList.H"
diff --git a/src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolationTemplate.C
similarity index 99%
rename from src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
rename to src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolationTemplate.C
index 4790085c4..d00a007df 100644
--- a/src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolationTemplate.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatchInterpolation.H"
+#include "PrimitivePatchInterpolationTemplate.H"
 #include "faceList.H"
 #include "demandDrivenData.H"
 
diff --git a/src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolationTemplate.H
similarity index 100%
rename from src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
rename to src/foam/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolationTemplate.H
diff --git a/src/foam/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H b/src/foam/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
index f044ad8e2..13c4d9c8d 100644
--- a/src/foam/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
+++ b/src/foam/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
@@ -32,7 +32,7 @@ Description
 #ifndef primitivePatchInterpolation_H
 #define primitivePatchInterpolation_H
 
-#include "PrimitivePatchInterpolation.H"
+#include "PrimitivePatchInterpolationTemplate.H"
 #include "PrimitivePatch.H"
 #include "face.H"
 #include "SubList.H"
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
index 122b96e6d..68f764859 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
@@ -34,7 +34,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 #include "DynamicList.H"
 
 
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
index 265c304a3..6f25e315b 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 #include "HashSet.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
index a0059278b..3f1f72be2 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
@@ -26,7 +26,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 #include "Map.H"
 #include "ListOps.H"
 #include "OFstream.H"
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
index c49bfac50..34ede5e8d 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 #include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
index 9c12c032f..a477b4465 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
@@ -27,7 +27,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
index f90a37bba..373903ef6 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 #include "Map.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
index fda73107d..7e5616a98 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchName.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchName.C
index 373bf2823..83eaee2c5 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchName.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchName.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index c7f129582..709e3b87d 100644
--- a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -26,7 +26,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatch.H"
+#include "PrimitivePatchTemplate.H"
 #include "SLList.H"
 
 
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchTemplate.C
similarity index 100%
rename from src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
rename to src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchTemplate.C
diff --git a/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchTemplate.H
similarity index 100%
rename from src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
rename to src/foam/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchTemplate.H
diff --git a/src/foam/meshes/primitiveShapes/objectHit/PointHit.H b/src/foam/meshes/primitiveShapes/objectHit/PointHitTemplate.H
similarity index 100%
rename from src/foam/meshes/primitiveShapes/objectHit/PointHit.H
rename to src/foam/meshes/primitiveShapes/objectHit/PointHitTemplate.H
diff --git a/src/foam/meshes/primitiveShapes/objectHit/point2DHit.H b/src/foam/meshes/primitiveShapes/objectHit/point2DHit.H
index 039038068..4f3ecdb10 100644
--- a/src/foam/meshes/primitiveShapes/objectHit/point2DHit.H
+++ b/src/foam/meshes/primitiveShapes/objectHit/point2DHit.H
@@ -32,7 +32,7 @@ Description
 #define point2DHit_H
 
 #include "point2D.H"
-#include "PointHit.H"
+#include "PointHitTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/meshes/primitiveShapes/objectHit/pointHit.H b/src/foam/meshes/primitiveShapes/objectHit/pointHit.H
index b2cc2ae18..8d24852cb 100644
--- a/src/foam/meshes/primitiveShapes/objectHit/pointHit.H
+++ b/src/foam/meshes/primitiveShapes/objectHit/pointHit.H
@@ -32,7 +32,7 @@ Description
 #define pointHit_H
 
 #include "point.H"
-#include "PointHit.H"
+#include "PointHitTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/Kappa
similarity index 98%
rename from tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/Kappa
index 5d35d8296..af8cc8e81 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/Kappa
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      K;
+    object      Kappa;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Kappa
similarity index 97%
rename from tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Kappa
index 2e20a717f..23d4c625a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Kappa
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      K;
+    object      Kappa;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Kappa
similarity index 97%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
rename to tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Kappa
index 2e20a717f..23d4c625a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Kappa
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      K;
+    object      Kappa;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //