diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
index f937a22f81..243949aa6b 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@@ -51,20 +51,20 @@ void Foam::functionObjects::fieldMinMax::output
 
         writeTabbed(file, fieldName);
 
-        file<< token::TAB << minValue
-            << token::TAB << minC;
+        file<< tab << minValue
+            << tab << minC;
 
         if (Pstream::parRun())
         {
-            file<< token::TAB << minProci;
+            file<< tab << minProci;
         }
 
-        file<< token::TAB << maxValue
-            << token::TAB << maxC;
+        file<< tab << maxValue
+            << tab << maxC;
 
         if (Pstream::parRun())
         {
-            file<< token::TAB << maxProci;
+            file<< tab << maxProci;
         }
 
         file<< endl;
@@ -89,7 +89,7 @@ void Foam::functionObjects::fieldMinMax::output
     }
     else
     {
-        file<< token::TAB << minValue << token::TAB << maxValue;
+        file<< tab << minValue << tab << maxValue;
 
         Log << "    min/max(" << outputName << ") = "
             << minValue << ' ' << maxValue;
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index e4280a2e42..8153003da3 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -534,10 +534,10 @@ bool Foam::functionObjects::regionSizeDistribution::write()
 
     if (debug)
     {
-        Info<< "    " << token::TAB << "Region"
-            << token::TAB << "Volume(mesh)"
-            << token::TAB << "Volume(" << alpha.name() << "):"
-            << token::TAB << "nCells"
+        Info<< "    " << tab << "Region"
+            << tab << "Volume(mesh)"
+            << tab << "Volume(" << alpha.name() << "):"
+            << tab << "nCells"
             << endl;
         scalar meshSumVol = 0.0;
         scalar alphaSumVol = 0.0;
@@ -554,20 +554,20 @@ bool Foam::functionObjects::regionSizeDistribution::write()
             ++vIter, ++aIter, ++numIter
         )
         {
-            Info<< "    " << token::TAB << vIter.key()
-                << token::TAB << vIter()
-                << token::TAB << aIter()
-                << token::TAB << numIter()
+            Info<< "    " << tab << vIter.key()
+                << tab << vIter()
+                << tab << aIter()
+                << tab << numIter()
                 << endl;
 
             meshSumVol += vIter();
             alphaSumVol += aIter();
             nCells += numIter();
         }
-        Info<< "    " << token::TAB << "Total:"
-            << token::TAB << meshSumVol
-            << token::TAB << alphaSumVol
-            << token::TAB << nCells
+        Info<< "    " << tab << "Total:"
+            << tab << meshSumVol
+            << tab << alphaSumVol
+            << tab << nCells
             << endl;
         Info<< endl;
     }
@@ -577,16 +577,16 @@ bool Foam::functionObjects::regionSizeDistribution::write()
 
     {
         Info<< "    Patch connected regions (liquid core):" << endl;
-        Info<< token::TAB << "    Region"
-            << token::TAB << "Volume(mesh)"
-            << token::TAB << "Volume(" << alpha.name() << "):"
+        Info<< tab << "    Region"
+            << tab << "Volume(mesh)"
+            << tab << "Volume(" << alpha.name() << "):"
             << endl;
         forAllConstIter(Map<label>, patchRegions, iter)
         {
             label regionI = iter.key();
-            Info<< "    " << token::TAB << iter.key()
-                << token::TAB << allRegionVolume[regionI]
-                << token::TAB << allRegionAlphaVolume[regionI] << endl;
+            Info<< "    " << tab << iter.key()
+                << tab << allRegionVolume[regionI]
+                << tab << allRegionAlphaVolume[regionI] << endl;
 
         }
         Info<< endl;
@@ -594,9 +594,9 @@ bool Foam::functionObjects::regionSizeDistribution::write()
 
     {
         Info<< "    Background regions:" << endl;
-        Info<< "    " << token::TAB << "Region"
-            << token::TAB << "Volume(mesh)"
-            << token::TAB << "Volume(" << alpha.name() << "):"
+        Info<< "    " << tab << "Region"
+            << tab << "Volume(mesh)"
+            << tab << "Volume(" << alpha.name() << "):"
             << endl;
         Map<scalar>::const_iterator vIter = allRegionVolume.begin();
         Map<scalar>::const_iterator aIter = allRegionAlphaVolume.begin();
@@ -615,9 +615,9 @@ bool Foam::functionObjects::regionSizeDistribution::write()
              && vIter() >= maxDropletVol
             )
             {
-                Info<< "    " << token::TAB << vIter.key()
-                    << token::TAB << vIter()
-                    << token::TAB << aIter() << endl;
+                Info<< "    " << tab << vIter.key()
+                    << tab << vIter()
+                    << tab << aIter() << endl;
             }
         }
         Info<< endl;
@@ -716,17 +716,17 @@ bool Foam::functionObjects::regionSizeDistribution::write()
         // Write to log
         {
             Info<< "    Bins:" << endl;
-            Info<< "    " << token::TAB << "Bin"
-                << token::TAB << "Min diameter"
-                << token::TAB << "Count:"
+            Info<< "    " << tab << "Bin"
+                << tab << "Min diameter"
+                << tab << "Count:"
                 << endl;
 
             scalar diam = 0.0;
             forAll(binCount, binI)
             {
-                Info<< "    " << token::TAB << binI
-                    << token::TAB << diam
-                    << token::TAB << binCount[binI] << endl;
+                Info<< "    " << tab << binI
+                    << tab << diam
+                    << tab << binCount[binI] << endl;
                 diam += delta;
             }
             Info<< endl;
diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
index 584c6d3666..f0f824b9dd 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
@@ -273,10 +273,10 @@ bool Foam::functionObjects::wallHeatFlux::write()
         {
             file()
                 << mesh_.time().value()
-                << token::TAB << pp.name()
-                << token::TAB << minHfp
-                << token::TAB << maxHfp
-                << token::TAB << integralHfp
+                << tab << pp.name()
+                << tab << minHfp
+                << tab << maxHfp
+                << tab << integralHfp
                 << endl;
         }
 
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index bb47362efe..356cd4ab59 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -249,9 +249,9 @@ bool Foam::functionObjects::wallShearStress::write()
         if (Pstream::master())
         {
             file() << mesh_.time().value()
-                << token::TAB << pp.name()
-                << token::TAB << minSsp
-                << token::TAB << maxSsp
+                << tab << pp.name()
+                << tab << minSsp
+                << tab << maxSsp
                 << endl;
         }
 
diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C
index 65fbfab2a6..3fb1d78792 100644
--- a/src/functionObjects/field/yPlus/yPlus.C
+++ b/src/functionObjects/field/yPlus/yPlus.C
@@ -225,10 +225,10 @@ bool Foam::functionObjects::yPlus::write()
 
                 writeTime(file());
                 file()
-                    << token::TAB << patch.name()
-                    << token::TAB << minYplus
-                    << token::TAB << maxYplus
-                    << token::TAB << avgYplus
+                    << tab << patch.name()
+                    << tab << minYplus
+                    << tab << maxYplus
+                    << tab << avgYplus
                     << endl;
             }
         }
diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C
index f8cb1dfb71..cb2811edaf 100644
--- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C
+++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,8 +133,8 @@ bool Foam::functionObjects::cloudInfo::write()
         {
             writeTime(file(i));
             file(i)
-                << token::TAB
-                << nParcels << token::TAB
+                << tab
+                << nParcels << tab
                 << massInSystem << endl;
         }
     }
diff --git a/src/functionObjects/utilities/residuals/residualsTemplates.C b/src/functionObjects/utilities/residuals/residualsTemplates.C
index a1d0c42e8e..fe6fd3732c 100644
--- a/src/functionObjects/utilities/residuals/residualsTemplates.C
+++ b/src/functionObjects/utilities/residuals/residualsTemplates.C
@@ -83,13 +83,13 @@ void Foam::functionObjects::residuals::writeResidual(const word& fieldName)
             {
                 if (component(validComponents, cmpt) != -1)
                 {
-                    file() << token::TAB << component(residual, cmpt);
+                    file() << tab << component(residual, cmpt);
                 }
             }
         }
         else
         {
-            file() << token::TAB << "N/A";
+            file() << tab << "N/A";
         }
     }
 }