diff --git a/applications/utilities/postProcessing/multiSolver/multiSolver.C b/applications/utilities/postProcessing/multiSolver/multiSolver.C
index 4a8478f11..7f8d0aed6 100644
--- a/applications/utilities/postProcessing/multiSolver/multiSolver.C
+++ b/applications/utilities/postProcessing/multiSolver/multiSolver.C
@@ -55,7 +55,7 @@ void parseOptions
         token nextOption(optionsStream);
 
         // Bug workaround
-        if (nextOption.type() == token::ERROR)
+        if (nextOption.type() == token::FATALERROR)
         {
             break;
         }
@@ -89,7 +89,7 @@ void parseOptions
         token nextOption(optionsStream);
 
         // Bug workaround
-        if (nextOption.type() == token::ERROR)
+        if (nextOption.type() == token::FATALERROR)
         {
             break;
         }
diff --git a/src/dynamicMesh/meshMotion/solidBodyMotion/SKA/SKA.H b/src/dynamicMesh/meshMotion/solidBodyMotion/SKA/SKA.H
index 295a905d7..f305c796a 100644
--- a/src/dynamicMesh/meshMotion/solidBodyMotion/SKA/SKA.H
+++ b/src/dynamicMesh/meshMotion/solidBodyMotion/SKA/SKA.H
@@ -44,7 +44,7 @@ SourceFiles
 
 #include "solidBodyMotionFunction.H"
 #include "primitiveFields.H"
-#include "Vector2D.H"
+#include "Vector2DTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/equationReader/equationReader/equationReaderParse.C b/src/equationReader/equationReader/equationReaderParse.C
index d3510ec1f..feaa6f170 100644
--- a/src/equationReader/equationReader/equationReaderParse.C
+++ b/src/equationReader/equationReader/equationReaderParse.C
@@ -74,8 +74,8 @@ void Foam::equationReader::parse(label index) const
         tl[tl.size() - 1] = token(rawStream);
 
         // Bug fix - equations ending in brackets read an extra token of type
-        // ERROR at the end, caused by string replace ')' with ' ) ' above
-        if (tl[tl.size() - 1].type() == token::ERROR)
+        // FATALERROR at the end, caused by string replace ')' with ' ) ' above
+        if (tl[tl.size() - 1].type() == token::FATALERROR)
         {
             tl.setSize(tl.size() - 1);
             forceEnd = true;
diff --git a/src/finiteArea/faMesh/faGlobalMeshData/faProcessorTopology.H b/src/finiteArea/faMesh/faGlobalMeshData/faProcessorTopology.H
index fde3dd167..294d8f3c4 100644
--- a/src/finiteArea/faMesh/faGlobalMeshData/faProcessorTopology.H
+++ b/src/finiteArea/faMesh/faGlobalMeshData/faProcessorTopology.H
@@ -32,7 +32,7 @@ Description
 #ifndef faProcessorTopology_H
 #define faProcessorTopology_H
 
-#include "ProcessorTopology.H"
+#include "ProcessorTopologyTemplate.H"
 #include "processorFaPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lduSolvers/amg/amgPolicy/pamgPolicy.C b/src/lduSolvers/amg/amgPolicy/pamgPolicy.C
index 4fcb8bb64..77281f703 100644
--- a/src/lduSolvers/amg/amgPolicy/pamgPolicy.C
+++ b/src/lduSolvers/amg/amgPolicy/pamgPolicy.C
@@ -600,7 +600,7 @@ Foam::autoPtr<Foam::amgMatrix> Foam::pamgPolicy::restrictMatrix
     {
         if (interfaceFields.set(intI))
         {
-            interfaceFields[intI].interface().initInternalFieldTransfer
+            interfaceFields[intI].coupledInterface().initInternalFieldTransfer
             (
                 Pstream::blocking,
                 child_
@@ -617,7 +617,7 @@ Foam::autoPtr<Foam::amgMatrix> Foam::pamgPolicy::restrictMatrix
         if (interfaceFields.set(intI))
         {
             const lduInterface& fineInterface =
-                interfaceFields[intI].interface();
+                interfaceFields[intI].coupledInterface();
 
             fineInterfaceAddr.set
             (
@@ -640,7 +640,7 @@ Foam::autoPtr<Foam::amgMatrix> Foam::pamgPolicy::restrictMatrix
         if (interfaceFields.set(intI))
         {
             const lduInterface& fineInterface =
-                interfaceFields[intI].interface();
+                interfaceFields[intI].coupledInterface();
 
             coarseInterfaces.set
             (
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
index 9c9ad7895..6b193a76c 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
@@ -43,7 +43,7 @@ SourceFiles
 #include "mathematicalConstants.H"
 #include "radiationConstants.H"
 #include "interpolationTable.H"
-#include "Vector2D.H"
+#include "Vector2DTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H
index c98eb72fc..9185f9076 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H
@@ -37,7 +37,7 @@ Description
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 #include "volFields.H"
-#include "Vector2D.H"
+#include "Vector2DTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //