diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
index fdb8d149c2..17b7cc49cf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
@@ -58,16 +58,16 @@ functions
         functionObjectLibs ("libfoamToVTK.so");
 
         // When to write:
-        //  timeStep            (with optional outputInterval)
-        //  outputTime          (with optional outputInterval)
+        //  timeStep            (with optional writeInterval)
+        //  outputTime          (with optional writeInterval)
         //  adjustableTime
         //  runTime
         //  clockTime
         //  cpuTime
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         // Write every writeInterval (only valid for timeStemp, outputTime)
-        outputInterval  1;
+        writeInterval  1;
 
         // Interval of time (valid for adjustableTime, runTime, clockTime,
         //  cpuTime)
diff --git a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
index 1132a7a33f..2d540dae09 100644
--- a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
@@ -18,7 +18,7 @@ type            faceSource;
 functionObjectLibs ("libfieldFunctionObjects.so");
 
 enabled         true;
-outputControl   timeStep;
+writeControl   timeStep;
 writeInterval   1;
 
 valueOutput     false;
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2.cfg b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
index 0722af8f62..7db52b5571 100644
--- a/etc/caseDicts/postProcessing/fields/Lambda2.cfg
+++ b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
@@ -18,6 +18,6 @@ type            Lambda2;
 functionObjectLibs ("libutilityFunctionObjects.so");
 
 enabled         true;
-outputControl   outputTime;
+writeControl   outputTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/Q.cfg b/etc/caseDicts/postProcessing/fields/Q.cfg
index 5def0533fb..a1d42b27f4 100644
--- a/etc/caseDicts/postProcessing/fields/Q.cfg
+++ b/etc/caseDicts/postProcessing/fields/Q.cfg
@@ -18,6 +18,6 @@ type            Q;
 functionObjectLibs ("libutilityFunctionObjects.so");
 
 enabled         true;
-outputControl   outputTime;
+writeControl   outputTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/postProcessing/forces/forces.cfg
index 4d36643c8c..9d78c1d2cb 100644
--- a/etc/caseDicts/postProcessing/forces/forces.cfg
+++ b/etc/caseDicts/postProcessing/forces/forces.cfg
@@ -18,8 +18,8 @@ type            forces;
 functionObjectLibs ( "libforces.so" );
 
 enabled         true;
-outputControl   timeStep;
-outputInterval  1;
+writeControl   timeStep;
+writeInterval  1;
 
 pName           p;
 UName           U;
diff --git a/etc/caseDicts/postProcessing/graphs/graph.cfg b/etc/caseDicts/postProcessing/graphs/graph.cfg
index 629aea0f8c..e9de6a2c13 100644
--- a/etc/caseDicts/postProcessing/graphs/graph.cfg
+++ b/etc/caseDicts/postProcessing/graphs/graph.cfg
@@ -18,7 +18,7 @@ type            sets;
 functionObjectLibs ("libsampling.so");
 
 enabled         true;
-outputControl   outputTime;
+writeControl   outputTime;
 
 sets
 (
diff --git a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
index 53374d6a22..d7de7029c6 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
@@ -18,7 +18,7 @@ type            cellSource;
 functionObjectLibs ("libfieldFunctionObjects.so");
 
 enabled         true;
-outputControl   timeStep;
+writeControl   timeStep;
 writeInterval   1;
 
 valueOutput     false;
diff --git a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
index 620b02cf60..4f6d9f36b2 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
@@ -18,7 +18,7 @@ type            faceSource;
 functionObjectLibs ("libfieldFunctionObjects.so");
 
 enabled         true;
-outputControl   timeStep;
+writeControl   timeStep;
 writeInterval   1;
 
 valueOutput     false;
diff --git a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
index 842cbbdf41..93c1a82eae 100644
--- a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
@@ -18,7 +18,7 @@ type            fieldMinMax;
 functionObjectLibs ("libfieldFunctionObjects.so");
 
 enabled         true;
-outputControl   timeStep;
+writeControl   timeStep;
 writeInterval   1;
 
 write           true;
diff --git a/etc/caseDicts/postProcessing/numerical/residuals.cfg b/etc/caseDicts/postProcessing/numerical/residuals.cfg
index 844c2810f3..a775830cf5 100644
--- a/etc/caseDicts/postProcessing/numerical/residuals.cfg
+++ b/etc/caseDicts/postProcessing/numerical/residuals.cfg
@@ -18,7 +18,7 @@ type            residuals;
 functionObjectLibs ("libutilityFunctionObjects.so");
 
 enabled         true;
-outputControl   timeStep;
-outputInterval  1;
+writeControl   timeStep;
+writeInterval  1;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
index f8b1ef96db..b1f5dfb82c 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
@@ -20,7 +20,7 @@ functionObjectLibs ("libfieldFunctionObjects.so");
 operation       subtract;
 
 enabled         true;
-outputControl   timeStep;
+writeControl   timeStep;
 writeInterval   1
 log             false;
 
diff --git a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
index 331875a431..10008b2638 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
@@ -18,7 +18,7 @@ type            pressureTools;
 functionObjectLibs ("libutilityFunctionObjects.so");
 
 enabled         true;
-outputControl   outputTime;
+writeControl   outputTime;
 log             false;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/cloud.cfg b/etc/caseDicts/postProcessing/probes/cloud.cfg
index 87cd5e7bd8..1a2a10b744 100644
--- a/etc/caseDicts/postProcessing/probes/cloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/cloud.cfg
@@ -18,6 +18,6 @@ type            sets;
 functionObjectLibs ("libsampling.so");
 
 enabled         true;
-outputControl   outputTime;
+writeControl   outputTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/probes.cfg b/etc/caseDicts/postProcessing/probes/probes.cfg
index 462851bd10..5a9b63aaa9 100644
--- a/etc/caseDicts/postProcessing/probes/probes.cfg
+++ b/etc/caseDicts/postProcessing/probes/probes.cfg
@@ -18,7 +18,7 @@ type            probes;
 functionObjectLibs ("libsampling.so");
 
 enabled         true;
-outputControl   timeStep;
-outputInterval  1;
+writeControl   timeStep;
+writeInterval  1;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
index 425b921da9..eaeea4073d 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
@@ -18,7 +18,7 @@ type            scalarTransport;
 functionObjectLibs ("libutilityFunctionObjects.so");
 
 enabled         true;
-outputControl   timeStep;
+writeControl   timeStep;
 writeInterval   1;
 
 write           true;
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines.cfg b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
index 8673f72217..6883c570e3 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines.cfg
+++ b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
@@ -17,7 +17,7 @@ FoamFile
 type            streamLine;
 functionObjectLibs ( "libfieldFunctionObjects.so" );
 
-outputControl   outputTime;
+writeControl   outputTime;
 
 setFormat       vtk;
 UName           U;
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces.cfg b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
index cdd1cefc08..a87bd5a4a4 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces.cfg
+++ b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
@@ -18,7 +18,7 @@ type            surfaces;
 functionObjectLibs ("libsampling.so");
 
 enabled         true;
-outputControl   outputTime;
+writeControl   outputTime;
 
 surfaceFormat   vtk;
 interpolationScheme cellPoint;
diff --git a/etc/templates/axisymmetricJet/system/graph b/etc/templates/axisymmetricJet/system/graph
index b8a7cdf2eb..fa17d0cb3b 100644
--- a/etc/templates/axisymmetricJet/system/graph
+++ b/etc/templates/axisymmetricJet/system/graph
@@ -18,7 +18,7 @@ graph
 {
     type            sets;
     functionObjectLibs ("libsampling.so");
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     interpolationScheme cellPointFace;
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index a24631da12..7fbff70da6 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -218,7 +218,7 @@ db/functionObjects/functionObject/functionObject.C
 db/functionObjects/functionObjectList/functionObjectList.C
 db/functionObjects/functionObjectFile/functionObjectFile.C
 db/functionObjects/functionObjectFiles/functionObjectFiles.C
-db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
+db/functionObjects/outputFilterControl/outputFilterControl.C
 
 
 Time = db/Time
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
index acdde24b1f..087de87cb3 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
@@ -61,19 +61,21 @@ Foam::OutputFilterFunctionObject<OutputFilter>::OutputFilterFunctionObject
     functionObject(name),
     time_(t),
     dict_(dict),
-    regionName_(dict.lookupOrDefault("region", polyMesh::defaultRegion)),
     timeStart_(-VGREAT),
     timeEnd_(VGREAT),
     nStepsToStartTimeChange_
     (
         dict.lookupOrDefault("nStepsToStartTimeChange", 3)
     ),
-    outputControl_(t, dict, "output"),
+    writeControl_(t, dict, "write"),
     evaluateControl_(t, dict, "evaluate"),
     filter_
     (
         name,
-        time_.lookupObject<objectRegistry>(regionName_),
+        time_.lookupObject<objectRegistry>
+        (
+            dict.lookupOrDefault("region", polyMesh::defaultRegion)
+        ),
         dict_
     )
 {
@@ -96,7 +98,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::execute
             filter_.execute();
         }
 
-        if (forceWrite || outputControl_.output())
+        if (forceWrite || writeControl_.output())
         {
             filter_.write();
         }
@@ -111,7 +113,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::end()
 {
     filter_.end();
 
-    if (outputControl_.output())
+    if (writeControl_.output())
     {
         filter_.write();
     }
@@ -138,12 +140,12 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::adjustTimeStep()
     if
     (
         active()
-     && outputControl_.outputControl()
-     == outputFilterOutputControl::ocAdjustableRunTime
+     && writeControl_.writeControl()
+     == outputFilterControl::ocAdjustableRunTime
     )
     {
-        const label  outputTimeIndex = outputControl_.outputTimeLastDump();
-        const scalar writeInterval = outputControl_.writeInterval();
+        const label  outputTimeIndex = writeControl_.outputTimeLastDump();
+        const scalar writeInterval = writeControl_.writeInterval();
 
         scalar timeToNextWrite = max
         (
@@ -188,7 +190,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::read
     {
         dict_ = dict;
 
-        outputControl_.read(dict);
+        writeControl_.read(dict);
         evaluateControl_.read(dict);
         readControls();
 
@@ -207,7 +209,7 @@ void Foam::OutputFilterFunctionObject<OutputFilter>::updateMesh
     const mapPolyMesh& mpm
 )
 {
-    if (active() && mpm.mesh().name() == regionName_)
+    if (active())
     {
         filter_.updateMesh(mpm);
     }
@@ -220,7 +222,7 @@ void Foam::OutputFilterFunctionObject<OutputFilter>::movePoints
     const polyMesh& mesh
 )
 {
-    if (active() && mesh.name() == regionName_)
+    if (active())
     {
         filter_.movePoints(mesh);
     }
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
index d62e5afdec..e0cd4e8c36 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
@@ -44,7 +44,7 @@ SourceFiles
 
 #include "functionObject.H"
 #include "dictionary.H"
-#include "outputFilterOutputControl.H"
+#include "outputFilterControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -71,9 +71,6 @@ class OutputFilterFunctionObject
 
         // Optional user inputs
 
-            //- Name of region - defaults to name of polyMesh::defaultRegion
-            const word regionName_;
-
             //- Activation time - defaults to -VGREAT
             scalar timeStart_;
 
@@ -86,10 +83,10 @@ class OutputFilterFunctionObject
 
 
         //- Output controls
-        outputFilterOutputControl outputControl_;
+        outputFilterControl writeControl_;
 
         //- Evaluate controls
-        outputFilterOutputControl evaluateControl_;
+        outputFilterControl evaluateControl_;
 
         //- The output filter
         OutputFilter filter_;
@@ -141,7 +138,7 @@ public:
             inline const word& regionName() const;
 
             //- Return the output control object
-            inline const outputFilterOutputControl& outputControl() const;
+            inline const outputFilterControl& writeControl() const;
 
             //- Return the output filter
             inline const OutputFilter& outputFilter() const;
@@ -150,7 +147,7 @@ public:
         // Function object control
 
             //- Called at each ++ or += of the time-loop.
-            //  forceWrite overrides the usual outputControl behaviour and
+            //  forceWrite overrides the usual writeControl behaviour and
             //  forces writing (used in post-processing mode)
             virtual bool execute(const bool forceWrite = false);
 
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H
index 0e8be54e32..502c701c0d 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H
@@ -42,18 +42,10 @@ Foam::OutputFilterFunctionObject<OutputFilter>::dict() const
 
 
 template<class OutputFilter>
-inline const Foam::word&
-Foam::OutputFilterFunctionObject<OutputFilter>::regionName() const
+inline const Foam::outputFilterControl&
+Foam::OutputFilterFunctionObject<OutputFilter>::writeControl() const
 {
-    return regionName_;
-}
-
-
-template<class OutputFilter>
-inline const Foam::outputFilterOutputControl&
-Foam::OutputFilterFunctionObject<OutputFilter>::outputControl() const
-{
-    return outputControl_;
+    return writeControl_;
 }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index a56625d579..952a93d2bf 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -51,8 +51,8 @@ Description
                 enabled             yes;
                 timeStart           0;
                 timeEnd             10;
-                outputControl       outputTime;
-                outputInterval      1;
+                writeControl        outputTime;
+                writeInterval       1;
                 ...
             }
         }
@@ -62,13 +62,27 @@ Description
     \table
         Property | Description                       | Required | Default value
         type     | Type of function object               | yes      |
-        functionObjectLibs | Libraries containing object implementation | yes |
+        functionObjectLibs | Libraries containing implementation | yes |
         region   | Name of region for multi-region cases | no       |
         enabled  | On/off switch                         | no       | yes
         timeStart| Start time                            | no       |
         timeEnd  | End time                              | no       |
-        outputControl | Either 'outputTime' or 'timeStep'| no | timeStep
-        outputInterval| Steps between output for outputControl=timeStep | no | 1
+        evaluateControl | See time controls below        | no       | timeStep
+        evaluateInterval   | Steps between output           | no       |
+        writeControl   | See time controls below        | no       | timeStep
+        writeInterval   | Steps between output           | no       |
+    \endtable
+
+    Time controls:
+    \table
+        Option            | Description
+        timeStep          | Execute/write every 'writeInterval' time-steps
+        outputTime        | Execute/write every 'writeInterval' output times
+        adjustableRunTime | Execute/write every 'writeInterval' run time period
+        runTime           | Execute/write every 'writeInterval' run time period
+        clockTime       | Execute/write every 'writeInterval' clock time period
+        cpuTime           | Execute/write every 'writeInterval' CPU time period
+        none              | Execute/write every time-step
     \endtable
 
     The sub-dictionary name \c myFunctionObject is chosen by the user, and is
@@ -184,7 +198,7 @@ public:
         virtual const word& name() const;
 
         //- Called at each ++ or += of the time-loop. forceWrite overrides
-        //  the usual outputControl behaviour and forces writing always
+        //  the usual writeControl behaviour and forces writing always
         //  (used in post-processing mode)
         virtual bool execute(const bool forceWrite) = 0;
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 41b43b4c5f..ca373b0c11 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -171,7 +171,7 @@ public:
         bool start();
 
         //- Called at each ++ or += of the time-loop. forceWrite overrides
-        //  the usual outputControl behaviour and forces writing always
+        //  the usual writeControl behaviour and forces writing always
         //  (used in post-processing mode)
         bool execute(const bool forceWrite = false);
 
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.C
similarity index 73%
rename from src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
rename to src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.C
index c48f4fcb9d..78f8268534 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
+++ b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "outputFilterOutputControl.H"
+#include "outputFilterControl.H"
 #include "PstreamReduceOps.H"
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
@@ -31,10 +31,11 @@ License
 namespace Foam
 {
     template<>
-    const char* NamedEnum<outputFilterOutputControl::outputControls, 7>::
+    const char* NamedEnum<outputFilterControl::writeControls, 8>::
     names[] =
     {
         "timeStep",
+        "writeTime",
         "outputTime",
         "adjustableRunTime",
         "runTime",
@@ -44,13 +45,13 @@ namespace Foam
     };
 }
 
-const Foam::NamedEnum<Foam::outputFilterOutputControl::outputControls, 7>
-    Foam::outputFilterOutputControl::outputControlNames_;
+const Foam::NamedEnum<Foam::outputFilterControl::writeControls, 8>
+    Foam::outputFilterControl::writeControlNames_;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::outputFilterOutputControl::outputFilterOutputControl
+Foam::outputFilterControl::outputFilterControl
 (
     const Time& t,
     const dictionary& dict,
@@ -59,10 +60,10 @@ Foam::outputFilterOutputControl::outputFilterOutputControl
 :
     time_(t),
     prefix_(prefix),
-    outputControl_(ocTimeStep),
+    writeControl_(ocTimeStep),
     outputInterval_(0),
-    outputTimeLastDump_(0),
-    writeInterval_(-1)
+    writeInterval_(-1),
+    outputTimeLastDump_(0)
 {
     read(dict);
 }
@@ -70,27 +71,41 @@ Foam::outputFilterOutputControl::outputFilterOutputControl
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::outputFilterOutputControl::~outputFilterOutputControl()
+Foam::outputFilterControl::~outputFilterControl()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::outputFilterOutputControl::read(const dictionary& dict)
+void Foam::outputFilterControl::read(const dictionary& dict)
 {
-    const word controlName(prefix_ + "Control");
-    const word intervalName(prefix_ + "Interval");
+    word controlName(prefix_ + "Control");
+    word intervalName(prefix_ + "Interval");
+
+    // For backward compatibility support the deprecated 'outputControl' option
+    // now superseded by 'writeControl' for compatibility with Time
+    if (prefix_ == "write" && dict.found("outputControl"))
+    {
+        IOWarningInFunction(dict)
+            << "Using deprecated 'outputControl'" << nl
+            << "    Please use 'writeControl' with 'writeInterval'"
+            << endl;
+
+        // Change to the old names for this option
+        controlName = "outputControl";
+        intervalName = "outputInterval";
+    }
 
     if (dict.found(controlName))
     {
-        outputControl_ = outputControlNames_.read(dict.lookup(controlName));
+        writeControl_ = writeControlNames_.read(dict.lookup(controlName));
     }
     else
     {
-        outputControl_ = ocTimeStep;
+        writeControl_ = ocTimeStep;
     }
 
-    switch (outputControl_)
+    switch (writeControl_)
     {
         case ocTimeStep:
         {
@@ -98,6 +113,7 @@ void Foam::outputFilterOutputControl::read(const dictionary& dict)
             break;
         }
 
+        case ocWriteTime:
         case ocOutputTime:
         {
             outputInterval_ = dict.lookupOrDefault<label>(intervalName, 1);
@@ -109,22 +125,21 @@ void Foam::outputFilterOutputControl::read(const dictionary& dict)
         case ocCpuTime:
         case ocAdjustableRunTime:
         {
-            writeInterval_ = readScalar(dict.lookup("writeInterval"));
+            writeInterval_ = readScalar(dict.lookup(intervalName));
             break;
         }
 
         default:
         {
-            // do nothing
             break;
         }
     }
 }
 
 
-bool Foam::outputFilterOutputControl::output()
+bool Foam::outputFilterControl::output()
 {
-    switch (outputControl_)
+    switch (writeControl_)
     {
         case ocTimeStep:
         {
@@ -136,11 +151,12 @@ bool Foam::outputFilterOutputControl::output()
             break;
         }
 
+        case ocWriteTime:
         case ocOutputTime:
         {
             if (time_.outputTime())
             {
-                outputTimeLastDump_ ++;
+                outputTimeLastDump_++;
                 return !(outputTimeLastDump_ % outputInterval_);
             }
             break;
@@ -155,7 +171,7 @@ bool Foam::outputFilterOutputControl::output()
                     (time_.value() - time_.startTime().value())
                   + 0.5*time_.deltaTValue()
                 )
-                / writeInterval_
+               /writeInterval_
             );
 
             if (outputIndex > outputTimeLastDump_)
@@ -171,7 +187,7 @@ bool Foam::outputFilterOutputControl::output()
             label outputIndex = label
             (
                 returnReduce(time_.elapsedCpuTime(), maxOp<double>())
-                / writeInterval_
+               /writeInterval_
             );
             if (outputIndex > outputTimeLastDump_)
             {
@@ -186,7 +202,7 @@ bool Foam::outputFilterOutputControl::output()
             label outputIndex = label
             (
                 returnReduce(label(time_.elapsedClockTime()), maxOp<label>())
-                / writeInterval_
+               /writeInterval_
             );
             if (outputIndex > outputTimeLastDump_)
             {
@@ -203,10 +219,9 @@ bool Foam::outputFilterOutputControl::output()
 
         default:
         {
-            // this error should not actually be possible
             FatalErrorInFunction
                 << "Undefined output control: "
-                << outputControlNames_[outputControl_] << nl
+                << writeControlNames_[writeControl_] << nl
                 << abort(FatalError);
             break;
         }
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.H
similarity index 77%
rename from src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
rename to src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.H
index 0f3fbf081d..0efb6918b6 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControl.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::outputFilterOutputControl
+    Foam::outputFilterControl
 
 Description
     An output control for function objects.
     The default is time-step execution at every interval.
 
 SourceFiles
-    outputFilterOutputControl.C
+    outputFilterControl.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef outputFilterOutputControl_H
-#define outputFilterOutputControl_H
+#ifndef outputFilterControl_H
+#define outputFilterControl_H
 
 #include "dictionary.H"
 #include "Time.H"
@@ -46,17 +46,18 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                  Class outputFilterOutputControl Declaration
+                  Class outputFilterControl Declaration
 \*---------------------------------------------------------------------------*/
 
-class outputFilterOutputControl
+class outputFilterControl
 {
 public:
 
     //- The output control options
-    enum outputControls
+    enum writeControls
     {
         ocTimeStep,           //!< execution is coupled to the time-step
+        ocWriteTime,          //!< execution is coupled to the write-time
         ocOutputTime,         //!< execution is coupled to the output-time
         ocAdjustableRunTime,  //!< Adjust time step for dumping
         ocRunTime,            //!< run time for dumping
@@ -76,29 +77,29 @@ private:
         //- Prefix
         const word prefix_;
 
-        //- String representation of outputControls enums
-        static const NamedEnum<outputControls, 7> outputControlNames_;
+        //- String representation of writeControls enums
+        static const NamedEnum<writeControls, 8> writeControlNames_;
 
         //- Type of output
-        outputControls outputControl_;
+        writeControls writeControl_;
 
         //- The execution interval (in time steps) when using \c timeStep mode,
         //  a value <= 1 means execute at every time step
         label outputInterval_;
 
+        //- Dump each deltaT (adjust Ttime)
+        scalar writeInterval_;
+
         //- Dumping counter for ocOutputTime or index dump
         //  for ocAdjustableRunTime
         label outputTimeLastDump_;
 
-        //- Dump each deltaT (adjust Ttime)
-        scalar writeInterval_;
-
 
     // Private Member Functions
 
         //- Disallow default bitwise copy construct and assignment
-        outputFilterOutputControl(const outputFilterOutputControl&);
-        void operator=(const outputFilterOutputControl&);
+        outputFilterControl(const outputFilterControl&);
+        void operator=(const outputFilterControl&);
 
 
 public:
@@ -106,7 +107,7 @@ public:
     // Constructors
 
         //- Construct from Time object and dictionary
-        outputFilterOutputControl
+        outputFilterControl
         (
             const Time&,
             const dictionary&,
@@ -115,7 +116,7 @@ public:
 
 
     //- Destructor
-    ~outputFilterOutputControl();
+    ~outputFilterControl();
 
 
     // Member Functions
@@ -124,31 +125,19 @@ public:
         void read(const dictionary&);
 
         //- Return const access to the Time object
-        const Time& time() const
-        {
-            return time_;
-        }
+        inline const Time& time() const;
 
         //- Flag to indicate whether to output
         bool output();
 
-        //- Return outputControl
-        outputControls outputControl() const
-        {
-            return outputControl_;
-        }
+        //- Return writeControl
+        inline writeControls writeControl() const;
 
         //- Return writeInterval
-        scalar writeInterval() const
-        {
-            return writeInterval_;
-        }
+        inline scalar writeInterval() const;
 
         //- Return outputTimeLastDump
-        label outputTimeLastDump() const
-        {
-            return outputTimeLastDump_;
-        }
+        inline label outputTimeLastDump() const;
 };
 
 
@@ -158,6 +147,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "outputFilterControlI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControlI.H b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControlI.H
new file mode 100644
index 0000000000..8882977fc9
--- /dev/null
+++ b/src/OpenFOAM/db/functionObjects/outputFilterControl/outputFilterControlI.H
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::Time& Foam::outputFilterControl::time() const
+{
+    return time_;
+}
+
+
+inline Foam::outputFilterControl::writeControls
+Foam::outputFilterControl::writeControl() const
+{
+    return writeControl_;
+}
+
+
+inline Foam::scalar Foam::outputFilterControl::writeInterval() const
+{
+    return writeInterval_;
+}
+
+
+inline Foam::label Foam::outputFilterControl::outputTimeLastDump() const
+{
+    return outputTimeLastDump_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index 97f270f2bb..b00abc00c1 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -58,7 +58,7 @@ functions
         enabled         true;
 
         // When to output the average fields
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         // Fields to be averaged - runTime modifiable
         fields
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
index 4522612dbf..50e9eadaa6 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
@@ -28,7 +28,7 @@ functions
         enabled         true;
 
         // When to output the average fields
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         // Fields to be transformed - runTime modifiable
         fields
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index 5b0e8b7a3e..58207e81a5 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -52,7 +52,7 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         // Output to log&file (true) or to file only
         log             true;
@@ -93,7 +93,7 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
         log             true;
         valueOutput     true;
         source          faceZone;
@@ -111,7 +111,7 @@ functions
         type            cellSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
         log             true;
         valueOutput     true;
         source          cellZone;
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/controlDict b/src/postProcessing/functionObjects/field/nearWallFields/controlDict
index b0810202ce..71aea01795 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/controlDict
+++ b/src/postProcessing/functionObjects/field/nearWallFields/controlDict
@@ -54,8 +54,8 @@ functions
         type nearWallFields;
 
         // Output every
-        outputControl outputTime; //timeStep;
-        //outputInterval 5;
+        writeControl outputTime; //timeStep;
+        //writeInterval 5;
 
         // Fields to be sampled. Per field original name and mapped field to
         // create.
diff --git a/src/postProcessing/functionObjects/field/processorField/postProcessingDict b/src/postProcessing/functionObjects/field/processorField/postProcessingDict
index 683e70c493..cd537f669d 100644
--- a/src/postProcessing/functionObjects/field/processorField/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/processorField/postProcessingDict
@@ -28,7 +28,7 @@ functions
         enabled         true;
 
         // When to output the average fields
-        outputControl   outputTime;
+        writeControl   outputTime;
     }
 }
 
diff --git a/src/postProcessing/functionObjects/field/readFields/postProcessingDict b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
index c98ce21a4a..8c86608121 100644
--- a/src/postProcessing/functionObjects/field/readFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
@@ -21,8 +21,8 @@ functions
         type            readFields;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
 
         fields
         (
@@ -35,8 +35,8 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         log             true;
         valueOutput     true;
         source          faceZone;
diff --git a/src/postProcessing/functionObjects/field/streamLine/controlDict b/src/postProcessing/functionObjects/field/streamLine/controlDict
index 4f4ccd8055..cc0fb705e7 100644
--- a/src/postProcessing/functionObjects/field/streamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/streamLine/controlDict
@@ -54,8 +54,8 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Output every
-        outputControl   outputTime;
-        // outputInterval 10;
+        writeControl   outputTime;
+        // writeInterval 10;
 
         setFormat       vtk; //gnuplot, raw etc. See sampleDict.
 
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index 308a27bb44..84d985a1d6 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -35,6 +35,7 @@ License
 #include "mapDistribute.H"
 #include "interpolationCellPoint.H"
 #include "PatchTools.H"
+#include "mapPolyMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -697,16 +698,26 @@ void Foam::functionObjects::streamLine::write()
 }
 
 
-void Foam::functionObjects::streamLine::updateMesh(const mapPolyMesh&)
+void Foam::functionObjects::streamLine::updateMesh(const mapPolyMesh& mpm)
 {
-    read(dict_);
+    const fvMesh& mesh_ = dynamic_cast<const fvMesh&>(obr_);
+
+    if (&mpm.mesh() == &mesh_)
+    {
+        read(dict_);
+    }
 }
 
 
-void Foam::functionObjects::streamLine::movePoints(const polyMesh&)
+void Foam::functionObjects::streamLine::movePoints(const polyMesh& mesh)
 {
-    // Moving mesh affects the search tree
-    read(dict_);
+    const fvMesh& mesh_ = dynamic_cast<const fvMesh&>(obr_);
+
+    if (&mesh == &mesh_)
+    {
+        // Moving mesh affects the search tree
+        read(dict_);
+    }
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
index 3cf1f74d88..202a33a216 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
@@ -63,8 +63,8 @@ functions
         type nearWallFields;
 
         // Output every
-        outputControl   outputTime;
-        //outputInterval  1;
+        writeControl   outputTime;
+        //writeInterval  1;
 
         // Fields to be sampled. Per field original name and mapped field to
         // create.
@@ -86,8 +86,8 @@ functions
         type            wallBoundedStreamLine;
 
         // Output every
-        outputControl   timeStep;   //outputTime;
-        // outputInterval 10;
+        writeControl   timeStep;   //outputTime;
+        // writeInterval 10;
 
         setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
 
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index 1b02584b20..6c42012f92 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
@@ -37,6 +37,7 @@ License
 #include "PatchTools.H"
 #include "meshSearchMeshObject.H"
 #include "faceSet.H"
+#include "mapPolyMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -854,17 +855,30 @@ void Foam::functionObjects::wallBoundedStreamLine::write()
 
 void Foam::functionObjects::wallBoundedStreamLine::updateMesh
 (
-    const mapPolyMesh&
+    const mapPolyMesh& mpm
 )
 {
-    read(dict_);
+    const fvMesh& mesh_ = dynamic_cast<const fvMesh&>(obr_);
+
+    if (&mpm.mesh() == &mesh_)
+    {
+        read(dict_);
+    }
 }
 
 
-void Foam::functionObjects::wallBoundedStreamLine::movePoints(const polyMesh&)
+void Foam::functionObjects::wallBoundedStreamLine::movePoints
+(
+    const polyMesh& mesh
+)
 {
-    // Moving mesh affects the search tree
-    read(dict_);
+    const fvMesh& mesh_ = dynamic_cast<const fvMesh&>(obr_);
+
+    if (&mesh == &mesh_)
+    {
+        // Moving mesh affects the search tree
+        read(dict_);
+    }
 }
 
 
diff --git a/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict b/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
index da6d02204c..74fd3b9d37 100644
--- a/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
+++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
@@ -21,8 +21,8 @@ functions
         type            cloudInfo;
         functionObjectLibs ("libcloudFunctionObjects.so");
         enabled         true;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
 
         clouds          (myCloud1);
     }
diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
index 66f716037b..7ceff81034 100644
--- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
@@ -172,7 +172,7 @@ public:
         functionObject& redirectFunctionObject() const;
 
         //- Called at each ++ or += of the time-loop. forceWrite overrides the
-        //  outputControl behaviour.
+        //  writeControl behaviour.
         virtual bool execute(const bool forceWrite);
 
         //- Called when Time::run() determines that the time-loop exits.
diff --git a/src/postProcessing/functionObjects/utilities/partialWrite/controlDict b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
index 7544e46725..53ac6c2e2d 100644
--- a/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
@@ -71,14 +71,14 @@ functions
         //  runTime
         //  clockTime
         //  cpuTime
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         // Objects (fields or lagrangian fields in any of the clouds)
         // to write every outputTime
         objectNames    (p positions nParticle);
 
         // Write as normal every writeInterval'th outputTime.
-        outputInterval  1; // (timeStep, outputTime)
+        writeInterval  1; // (timeStep, outputTime)
 
         // Interval of time (sec) to write down(
         writeInterval   10.5 //(adjustableRunTime, runTime, clockTime, cpuTime)
@@ -94,16 +94,16 @@ functions
         functionObjectLibs ("libIOFunctionObjects.so");
 
         // When to write:
-        //  timeStep            (with optional outputInterval)
-        //  outputTime          (with optional outputInterval)
+        //  timeStep            (with optional writeInterval)
+        //  outputTime          (with optional writeInterval)
         //  adjustableRunTime
         //  runTime
         //  clockTime
         //  cpuTime
-        outputControl   outputTime;
+        writeControl   outputTime;
 
          // Write every writeInterval (only valid for timeStemp, outputTime)
-        outputInterval  1;
+        writeInterval  1;
 
          // Interval of time (valid for adjustableRunTime, runTime, clockTime,
         //  cpuTime)
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residuals.H b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
index 5b8b522694..2ffa4641a5 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residuals.H
+++ b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
@@ -35,8 +35,8 @@ Description
     residuals
     {
         type            residuals;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         fields
         (
             U
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
index 28039535f1..c8ab617c0a 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
@@ -136,14 +136,14 @@ bool Foam::functionObjects::setTimeStepFunctionObject::read
 
 void Foam::functionObjects::setTimeStepFunctionObject::updateMesh
 (
-    const mapPolyMesh& mpm
+    const mapPolyMesh&
 )
 {}
 
 
 void Foam::functionObjects::setTimeStepFunctionObject::movePoints
 (
-    const polyMesh& mesh
+    const polyMesh&
 )
 {}
 
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index 50749655df..84477be426 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -32,7 +32,7 @@ Description
     solvers with adjustTimeStep control (e.g. pimpleFoam). Makes no attempt
     to cooperate with other timeStep 'controllers' (maxCo, other
     functionObjects). Supports 'enabled' flag but none of othe other ones
-    'timeStart', 'timeEnd', 'outputControl' etc.
+    'timeStart', 'timeEnd', 'writeControl' etc.
 
 SourceFiles
     setTimeStepFunctionObject.C
@@ -125,10 +125,10 @@ public:
             virtual bool read(const dictionary&);
 
             //- Update for changes of mesh
-            virtual void updateMesh(const mapPolyMesh& mpm);
+            virtual void updateMesh(const mapPolyMesh&);
 
             //- Update for changes of mesh
-            virtual void movePoints(const polyMesh& mesh);
+            virtual void movePoints(const polyMesh&);
 };
 
 
diff --git a/src/postProcessing/functionObjects/utilities/systemCall/controlDict b/src/postProcessing/functionObjects/utilities/systemCall/controlDict
index 459278ca5b..8289a12593 100644
--- a/src/postProcessing/functionObjects/utilities/systemCall/controlDict
+++ b/src/postProcessing/functionObjects/utilities/systemCall/controlDict
@@ -51,7 +51,7 @@ functions
         type            systemCall;
         functionObjectLibs ("libsystemCall.so");
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         // called every time step
         executeCalls
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
index 08345371eb..cb2d146666 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
@@ -50,8 +50,8 @@ functions
     {
         type            timeActivatedFileUpdate;
         functionObjectLibs ("libutilityFunctionObjects.so");
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         fileToUpdate    "$FOAM_CASE/system/fvSolution";
 
         timeVsFile
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index 89fd0e1ee5..1b2b1d879d 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -38,8 +38,8 @@ Description
     {
         type              timeActivatedFileUpdate;
         functionObjectLibs ("libutilityFunctionObjects.so");
-        outputControl     timeStep;
-        outputInterval    1;
+        writeControl     timeStep;
+        writeInterval    1;
         fileToUpdate      "$FOAM_CASE/system/fvSolution";
         timeVsFile
         (
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
index 3c1d013bc1..aa00da824a 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
@@ -21,8 +21,8 @@ functions
         type            turbulenceFields;
         functionObjectLibs ("libutilityFunctionObjects.so");
         enabled         true;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
 
         fields
         (
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
index 7544e46725..53ac6c2e2d 100644
--- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
@@ -71,14 +71,14 @@ functions
         //  runTime
         //  clockTime
         //  cpuTime
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         // Objects (fields or lagrangian fields in any of the clouds)
         // to write every outputTime
         objectNames    (p positions nParticle);
 
         // Write as normal every writeInterval'th outputTime.
-        outputInterval  1; // (timeStep, outputTime)
+        writeInterval  1; // (timeStep, outputTime)
 
         // Interval of time (sec) to write down(
         writeInterval   10.5 //(adjustableRunTime, runTime, clockTime, cpuTime)
@@ -94,16 +94,16 @@ functions
         functionObjectLibs ("libIOFunctionObjects.so");
 
         // When to write:
-        //  timeStep            (with optional outputInterval)
-        //  outputTime          (with optional outputInterval)
+        //  timeStep            (with optional writeInterval)
+        //  outputTime          (with optional writeInterval)
         //  adjustableRunTime
         //  runTime
         //  clockTime
         //  cpuTime
-        outputControl   outputTime;
+        writeControl   outputTime;
 
          // Write every writeInterval (only valid for timeStemp, outputTime)
-        outputInterval  1;
+        writeInterval  1;
 
          // Interval of time (valid for adjustableRunTime, runTime, clockTime,
         //  cpuTime)
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
index adfe67752b..0bd41ea93d 100644
--- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
@@ -30,7 +30,7 @@ Group
 Description
     This function object allows specification of different writing frequency
     of objects registered to the database. It has similar functionality
-    as the main time database through the outputControl setting:
+    as the main time database through the writeControl setting:
 
     \li \c timeStep
     \li \c outputTime
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index f8874237cb..b802e1cb2a 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -352,9 +352,11 @@ void Foam::probes::read(const dictionary& dict)
 
 void Foam::probes::updateMesh(const mapPolyMesh& mpm)
 {
-    if (debug)
+    DebugInfo<< "probes: updateMesh" << endl;
+
+    if (&mpm.mesh() != &mesh_)
     {
-        Info<< "probes: updateMesh" << endl;
+        return;
     }
 
     if (fixedLocations_)
@@ -427,14 +429,11 @@ void Foam::probes::updateMesh(const mapPolyMesh& mpm)
 }
 
 
-void Foam::probes::movePoints(const polyMesh&)
+void Foam::probes::movePoints(const polyMesh& mesh)
 {
-    if (debug)
-    {
-        Info<< "probes: movePoints" << endl;
-    }
+    DebugInfo<< "probes: movePoints" << endl;
 
-    if (fixedLocations_)
+    if (fixedLocations_ && &mesh == &mesh_)
     {
         findElements(mesh_);
     }
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 6f57a96fb6..986955e262 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -30,6 +30,7 @@ License
 #include "ListListOps.H"
 #include "SortableList.H"
 #include "volPointInterpolation.H"
+#include "mapPolyMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -296,15 +297,21 @@ void Foam::sampledSets::correct()
 }
 
 
-void Foam::sampledSets::updateMesh(const mapPolyMesh&)
+void Foam::sampledSets::updateMesh(const mapPolyMesh& mpm)
 {
-    correct();
+    if (&mpm.mesh() == &mesh_)
+    {
+        correct();
+    }
 }
 
 
-void Foam::sampledSets::movePoints(const polyMesh&)
+void Foam::sampledSets::movePoints(const polyMesh& mesh)
 {
-    correct();
+    if (&mesh == &mesh_)
+    {
+        correct();
+    }
 }
 
 
diff --git a/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict b/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
index 7e92059c21..3024370154 100644
--- a/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
+++ b/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
@@ -15,7 +15,7 @@ functions
 
         functionObjectLibs ("libsampling.so");
 
-        outputControl   outputTime;
+        writeControl   outputTime;
         setFormat       gnuplot;
         fields          (p U);
         interpolationScheme cellPoint;
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 701135b402..b894d5ea66 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -30,6 +30,7 @@ License
 #include "IOmanip.H"
 #include "volPointInterpolation.H"
 #include "PatchTools.H"
+#include "mapPolyMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -245,17 +246,23 @@ void Foam::sampledSurfaces::read(const dictionary& dict)
 }
 
 
-void Foam::sampledSurfaces::updateMesh(const mapPolyMesh&)
+void Foam::sampledSurfaces::updateMesh(const mapPolyMesh& mpm)
 {
-    expire();
+    if (&mpm.mesh() == &mesh_)
+    {
+        expire();
+    }
 
     // pointMesh and interpolation will have been reset in mesh.update
 }
 
 
-void Foam::sampledSurfaces::movePoints(const polyMesh&)
+void Foam::sampledSurfaces::movePoints(const polyMesh& mesh)
 {
-    expire();
+    if (&mesh == &mesh_)
+    {
+        expire();
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
index 29b42ee983..fc131d876c 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
@@ -11,7 +11,7 @@ cuttingPlane
     type            surfaces;
     functionObjectLibs ("libsampling.so");
 
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
index 6332e42714..6c543652ae 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
@@ -56,8 +56,8 @@ functions
         functionObjectLibs ( "libsampling.so" );
         type probes;
         name probes;
-        outputControl timeStep;
-        outputInterval 1;
+        writeControl timeStep;
+        writeInterval 1;
         fields ( p );
         probeLocations
         (
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
index 06932c9369..0eba37a5e4 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
@@ -56,7 +56,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         fields
         (
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
index 29b42ee983..fc131d876c 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
@@ -11,7 +11,7 @@ cuttingPlane
     type            surfaces;
     functionObjectLibs ("libsampling.so");
 
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index bc4dac801a..aa126e906b 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -51,8 +51,8 @@ functions
     {
         type            forceCoeffs;
         functionObjectLibs ( "libforces.so" );
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
 
         patches
         (
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index 9023648489..9da666cb64 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -53,7 +53,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         fields
         (
@@ -118,7 +118,7 @@ functions
         type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
     }
 }
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 5a086c27b0..89674629bd 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -53,7 +53,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         restartOnOutput   off;
 
         fields
@@ -119,7 +119,7 @@ functions
         type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
     }
 }
 
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 8f2320499b..6c7a28c1bf 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -53,7 +53,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         fields
         (
@@ -118,7 +118,7 @@ functions
         type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
     }
 }
 
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 8fa72c1dde..12d011335f 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -53,7 +53,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         fields
         (
@@ -119,7 +119,7 @@ functions
         type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
     }
 
     forces1
@@ -127,7 +127,7 @@ functions
         type            forces;
         enabled         true;
         functionObjectLibs ( "libforces.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         patches         ( obstacle );
         directForceDensity true;
         fDName          fDMean;
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
index 29b42ee983..fc131d876c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
@@ -11,7 +11,7 @@ cuttingPlane
     type            surfaces;
     functionObjectLibs ("libsampling.so");
 
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
index aaf32f8a3b..13cc868421 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
@@ -15,7 +15,7 @@ Q
     type Q;
 
     // Output every
-    outputControl outputTime;
+    writeControl outputTime;
 }
 
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
index 0349e3e87e..e6e94fb65d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
@@ -12,7 +12,7 @@ forces
 
     functionObjectLibs ( "libforces.so" );
 
-    outputControl   timeStep;
+    writeControl   timeStep;
     timeInterval    1;
 
     log         yes;
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
index 113a8a4943..e017f1fa2a 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
@@ -10,7 +10,7 @@ surfaces
 {
     type            surfaces;
     functionObjectLibs ("libsampling.so");
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     surfaceFormat   vtk;
     fields          (p U Q);
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
index daf4a2f361..3fc415deaa 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
@@ -51,8 +51,8 @@ functions
     {
         type                forces;
         functionObjectLibs  ( "libforces.so" );
-        outputControl       timeStep;
-        outputInterval      10;
+        writeControl       timeStep;
+        writeInterval      10;
         patches             (wing);
         pName               p;
         UName               U;
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
index 72da914bee..ff898037e1 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
@@ -62,8 +62,8 @@ functions
         name            probes;
 
         // Write at same frequency as fields
-        outputControl   outputTime;
-        outputInterval  1;
+        writeControl   outputTime;
+        writeInterval  1;
 
         // Fields to be probed
         fields
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
index 27b7eb8a96..e6a77b6b24 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
@@ -62,8 +62,8 @@ functions
         name            probes;
 
         // Write at same frequency as fields
-        outputControl   outputTime;
-        outputInterval  1;
+        writeControl   outputTime;
+        writeInterval  1;
 
         // Fields to be probed
         fields
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
index 9dc482f560..056f78965c 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
@@ -52,7 +52,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         fields
         (
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
index 1344e903a9..652f9641e7 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
@@ -52,7 +52,7 @@ functions
     streamLines
     {
         type            streamLine;
-        outputControl   outputTime;
+        writeControl   outputTime;
         setFormat       vtk;
         UName           U;
         trackForward    true;
@@ -74,7 +74,7 @@ functions
     {
         type            surfaces;
         functionObjectLibs ( "libsampling.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         surfaceFormat   vtk;
         fields          ( p U );
         interpolationScheme cellPoint;
@@ -97,8 +97,8 @@ functions
     {
         type            forceCoeffs;
         functionObjectLibs ( "libforces.so" );
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         patches         ( "motorBike.*" );
         pName           p;
         UName           U;
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
index 140f824423..0734dddbfd 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
@@ -10,7 +10,7 @@ cuttingPlane
 {
     type            surfaces;
     functionObjectLibs ("libsampling.so");
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
index 8e8704743c..0befb9f69d 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
@@ -10,8 +10,8 @@ forces
 {
     type        forceCoeffs;
     functionObjectLibs ( "libforces.so" );
-    outputControl timeStep;
-    outputInterval 1;
+    writeControl timeStep;
+    writeInterval 1;
 
     patches     ( "motorBike.*" );
     pName       p;
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
index e5f7497292..df6155539f 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
@@ -11,8 +11,8 @@ streamLines
     type            streamLine;
 
     // Output every
-    outputControl   outputTime;
-    // outputInterval 10;
+    writeControl   outputTime;
+    // writeInterval 10;
 
     setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight;
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 18601d4485..b14bfb6e25 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -52,8 +52,8 @@ functions
         type            probes;
         functionObjectLibs ("libsampling.so");
         enabled         true;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
 
         fields
         (
@@ -78,7 +78,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         fields
         (
@@ -107,7 +107,7 @@ functions
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libsampling.so");
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         interpolationScheme cellPoint;
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
index 18601d4485..b14bfb6e25 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
@@ -52,8 +52,8 @@ functions
         type            probes;
         functionObjectLibs ("libsampling.so");
         enabled         true;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
 
         fields
         (
@@ -78,7 +78,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         fields
         (
@@ -107,7 +107,7 @@ functions
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libsampling.so");
         enabled         true;
-        outputControl   outputTime;
+        writeControl   outputTime;
 
         interpolationScheme cellPoint;
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
index 140f824423..0734dddbfd 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
@@ -10,7 +10,7 @@ cuttingPlane
 {
     type            surfaces;
     functionObjectLibs ("libsampling.so");
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     surfaceFormat   vtk;
     fields          ( p U );
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
index c18110d122..efa27c0eb6 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
@@ -12,7 +12,7 @@ forceCoeffs1
 
     functionObjectLibs ( "libforces.so" );
 
-    outputControl   timeStep;
+    writeControl   timeStep;
     timeInterval    1;
 
     log         yes;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index b4f882d9be..e03db10013 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -14,8 +14,8 @@ streamLines
     type            streamLine;
 
     // Output every
-    outputControl   outputTime;
-    // outputInterval 10;
+    writeControl   outputTime;
+    // writeInterval 10;
 
     setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight;
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index c071607c9a..a5c31d4ff0 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -15,7 +15,7 @@ near
     type nearWallFields;
 
     // Output every
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     // Fields to be sampled. Per field original name and mapped field to
     // create.
@@ -40,7 +40,7 @@ wallBoundedStreamLines
     type            wallBoundedStreamLine;
 
     // Output every
-    outputControl   outputTime;
+    writeControl   outputTime;
 
     setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index e003bc42fd..fdad9ab8b4 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -55,8 +55,8 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Output every
-        outputControl   outputTime;
-        // outputInterval 10;
+        writeControl   outputTime;
+        // writeInterval 10;
 
         setFormat       vtk; //gnuplot;//xmgr;//raw;//jplot;//csv;//ensight;
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 18e4c651fb..f7e5c216cf 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -55,8 +55,8 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Output every
-        outputControl   outputTime;
-        // outputInterval 10;
+        writeControl   outputTime;
+        // writeInterval 10;
 
         setFormat       vtk; //gnuplot;//xmgr;//raw;//jplot;//csv;//ensight;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
index 0db2ed9c0c..4421c236ad 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
@@ -58,7 +58,7 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         yes;
-        outputControl   outputTime;
+        writeControl   outputTime;
         log             yes;
         valueOutput     no;
         source          patch;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
index f9ae462cd4..c75428cf30 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
@@ -53,7 +53,7 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         yes;
-        outputControl   outputTime;
+        writeControl   outputTime;
         log             yes;
         valueOutput     no;
         source          patch;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
index 899d68f0a9..38aa97f087 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
@@ -53,7 +53,7 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         yes;
-        outputControl   outputTime;
+        writeControl   outputTime;
         log             yes;
         valueOutput     no;
         source          patch;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 4507e794d2..3da7d76dcd 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -56,7 +56,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index f6f1aa2f31..6daf316aaa 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -56,7 +56,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
index a510da92c9..79c542f0bd 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -58,7 +58,7 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        outputControl   outputTime;
+        writeControl   outputTime;
         probeLocations
         (
             (0 9.95 19.77)
@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         functionObjectLibs ("libsampling.so");
-        outputControl   outputTime;
+        writeControl   outputTime;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
index 0af365257e..0425ebae64 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
@@ -62,8 +62,8 @@ functions
         rhoName rho;
         UName   U;
         log     on;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         CofR (2.929541 0 0.2);
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index 7b2b7ad994..9f39c9d393 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -58,7 +58,7 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        outputControl   outputTime;
+        writeControl   outputTime;
         probeLocations
         (
             (0 9.95 19.77)
@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         functionObjectLibs ("libsampling.so");
-        outputControl   outputTime;
+        writeControl   outputTime;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index 7420497d78..a680109603 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        outputControl   outputTime;
+        writeControl   outputTime;
         probeLocations
         (
             (0 9.95 19.77)
@@ -74,7 +74,7 @@ functions
     {
         type            surfaces;
         functionObjectLibs ("libsampling.so");
-        outputControl   outputTime;
+        writeControl   outputTime;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 108f05ca61..288c68a66a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -57,8 +57,8 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         probeLocations
         (
             (0 9.95 19.77)
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 52325f532e..3c851f42e0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -57,8 +57,8 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         probeLocations
         (
             (0 9.95 19.77)
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 52325f532e..3c851f42e0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -57,8 +57,8 @@ functions
     {
         type            probes;
         functionObjectLibs ("libsampling.so");
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         probeLocations
         (
             (0 9.95 19.77)
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
index 8678787a00..1ecee4b6bb 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
@@ -56,8 +56,8 @@ functions
         rhoName rho;
         UName   U;
         log     on;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         CofR (2.929541 0 0.2);
     }
 }
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
index fab971dcef..865bb59d99 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
-        outputControl   timeStep;
+        writeControl   timeStep;
         log             true;
         // Output field values as well
         valueOutput     false;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
index d78ae2fd45..5d8e2c587d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
index dc617bd777..8df78e372c 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            forces;
         functionObjectLibs ("libforces.so");
-        outputControl   outputTime;
+        writeControl   outputTime;
         patches         (floatingObject);
         pName           p;
         UName           U;
@@ -72,8 +72,8 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         yes;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         log             yes;
         writeTotalArea  no;
         valueOutput     no;
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
index de8547f454..cb8fdb90bd 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            forces;
         functionObjectLibs ("libforces.so");
-        outputControl   outputTime;
+        writeControl   outputTime;
         patches         (floatingObject);
         pName           p;
         UName           U;
@@ -72,8 +72,8 @@ functions
         type            faceSource;
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         yes;
-        outputControl   timeStep;
-        outputInterval  1;
+        writeControl   timeStep;
+        writeInterval  1;
         log             yes;
         writeTotalArea  no;
         valueOutput     no;
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
index c718db4669..0d60606d49 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions0
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 26877364f2..ca4b6c409b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 26877364f2..ca4b6c409b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index fbbdb761ca..78983c43c1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.particles
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 26877364f2..ca4b6c409b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
index 04b7acab20..2f8d9ff108 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
@@ -26,7 +26,7 @@ inletMassFlowRate
 
     operation       sum;
 
-    outputControl   timeStep;
+    writeControl   timeStep;
 }
 
 outletMassFlowRate
@@ -49,7 +49,7 @@ outletMassFlowRate
 
     operation       sum;
 
-    outputControl   timeStep;
+    writeControl   timeStep;
 }
 
 totalMass
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 26877364f2..ca4b6c409b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 9718ec3234..6267df6d6b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.particles
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 0a0bfc89cf..5335b6c03c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 0a0bfc89cf..5335b6c03c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index db2ff7d973..f9d47130f3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.particles
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 0a0bfc89cf..5335b6c03c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 0a0bfc89cf..5335b6c03c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.air
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 519fbe0b29..10ddeb9399 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -57,7 +57,7 @@ functions
     {
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl   outputTime;
+        writeControl   outputTime;
         fields
         (
             U.particles