diff --git a/.gitignore b/.gitignore
index 7c8bce03feec4f13b689eaa7cd297c4fc5f08f42..43edf63dbb4eaf445e6e0b349cdbffd22e32e606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,10 +31,10 @@ core
 # dependency files - anywhere
 *.dep
 
-# lnInclude (symlink) folders - anywhere
+# lnInclude (symlink) directories - anywhere
 lnInclude
 
-# build folders - anywhere
+# build directories - anywhere
 linux*Clang*/
 linux*Gcc*/
 linux*Icc*/
@@ -44,7 +44,7 @@ solaris*Gcc*/
 SunOS*Gcc*/
 platforms/
 
-# reinstate wmake/rules that might look like build folders
+# reinstate wmake/rules that might look like build directories
 !wmake/rules/*/
 
 # doxygen generated documentation
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index b9d60d2f4c656d3c3cbb697d30f01204472540ef..6473bb4d88b999a0067960a1fd55186eadd11411 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -748,7 +748,7 @@ int main(int argc, char *argv[])
         subsetter.faceMap()
     )();
 
-    // Read all fields in time and constant folders
+    // Read all fields in time and constant directories
     IOobjectList objects(mesh, runTime.timeName());
     IOobjectList timeObjects(IOobjectList(mesh, mesh.facesInstance()));
     forAllConstIter(IOobjectList, timeObjects, iter)
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 0f937132468b17744300efc42a4868483c955048..a01507aef86d534476ae3d22c196a95057299779 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -44,7 +44,7 @@ void writeWeights
 (
     const scalarField& wghtSum,
     const primitivePatch& patch,
-    const fileName& folder,
+    const fileName& directory,
     const fileName& prefix,
     const word& timeName
 )
@@ -53,7 +53,7 @@ void writeWeights
 
     writer.write
     (
-        folder,
+        directory,
         prefix + "_proc" + Foam::name(Pstream::myProcNo()) + "_" + timeName,
         patch.localPoints(),
         patch.localFaces(),
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
index 29ad9ddbde30963b7001891fd3c5127612ac81cb..65c3fcaca679927180278e15c306f3116d26a634 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,12 +134,12 @@ void Foam::helpType::displayDoc
         // can use FOAM_DOC_BROWSER='application file://%f' if required
         docBrowser.replaceAll("%f", docFile);
 
-        fileName classFolder(parser.subDict(className).lookup("path"));
+        fileName classDirectory(parser.subDict(className).lookup("path"));
         word classFile(parser.subDict(className).lookup("name"));
 
         Info<< "Showing documentation for type " << className << nl << endl;
 
-        Info<< "Source file: " << classFolder.c_str() << classFile << nl
+        Info<< "Source file: " << classDirectory.c_str() << classFile << nl
             << endl;
 
         system(docBrowser);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index bc5899154266eb4038934b083fb3ec04b6eecd3a..1e2df860393e80a2d5cdfcdd400421f9f406c8b2 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
         volTensorField::typeName
     };
 
-    // Path to EnSight folder at case level only
+    // Path to EnSight directory at case level only
     // - For parallel cases, data only written from master
     fileName ensightDir = args.rootPath()/args.globalCaseName()/"EnSight";
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
index 0a615c5085bb0be31886c0bb3456569caca9988c..94d1763a20793698cc1cc5d2414da19d563cf413 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(
     -DWM_$ENV{WM_PRECISION_OPTION}
 )
 
-# Set output library destination to plugin folder
+# Set output library destination to plugin directory
 SET(
     LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
     CACHE INTERNAL
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
index ff2639ed4bfd4964b37f0a6fd633fa12fdfe908a..8166a78a8d69a24f2a597735168dfde2b8ed6ff3 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(
     -DWM_$ENV{WM_PRECISION_OPTION}
 )
 
-# Set output library destination to plugin folder
+# Set output library destination to plugin directory
 SET(
     LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
     CACHE INTERNAL
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index a587d33f346e6c2e8c06a899b5280275cd8c0fa0..92494c4f6b9eef4373bcdca261530d9798a63cb7 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(
     -DWM_$ENV{WM_PRECISION_OPTION}
 )
 
-# Set output library destination to plugin folder
+# Set output library destination to plugin directory
 SET(
     LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
     CACHE INTERNAL
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
index 21ee1a3f791f33db87017063157e8c92a149d24b..9ed8871208d165ef18b5a861580af9700d2f235f 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(
     -DWM_$ENV{WM_PRECISION_OPTION}
 )
 
-# Set output library destination to plugin folder
+# Set output library destination to plugin directory
 SET(
     LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
     CACHE INTERNAL
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 411643622c7549732d3dbc18fe72f485bb122561..3c13617a787c723cd0e120e1eb4f86c87d0df863 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ Application
 Description
     Execute the set of functionObjects specified in the selected dictionary
     (which defaults to system/controlDict) for the selected set of times.
-    Alternative dictionaries should be placed in the system/ folder.
+    Alternative dictionaries should be placed in the system/ directory.
 
     The flow (p-U) and optionally turbulence fields are available for the
     function objects to operate on allowing forces and other related properties
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
index dc0348da1a48cf2c7bf25a7590d7d5cc9ea3de65..000208b247e5bd8722fd6c74c58f70f6076408dd 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
     On execution, the field <fieldName> is read, and its boundary conditions
     interrogated for the presence of an \c externalCoupled type.  If found,
     the patch geometry (points and faces) for the coupled patches are output
-    to the communications folder.
+    to the communications directory.
 
 Note:
     The addressing is patch-local, i.e. point indices for each patch point
diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile
index 5e1108d06b3ea57b05ffe8824383e84af63dc523..eafbe480f04c105e918b48ecf99cd2553518ed94 100644
--- a/doc/Doxygen/Doxyfile
+++ b/doc/Doxygen/Doxyfile
@@ -562,14 +562,14 @@ SHOW_DIRECTORIES       = YES
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
+# Directory Tree View (if specified). The default is YES.
 
 SHOW_FILES             = YES
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the
 # Namespaces page.
 # This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
+# and from the Directory Tree View (if specified). The default is YES.
 
 SHOW_NAMESPACES        = YES
 
@@ -1080,7 +1080,7 @@ GENERATE_QHP           = NO
 
 # If the QHG_LOCATION tag is specified, the QCH_FILE tag can
 # be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
+# The path specified is relative to the HTML output directory.
 
 QCH_FILE               =
 
@@ -1092,7 +1092,7 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# http://doc.trolltech.com/qthelpproject.html#virtual-directories
 
 QHP_VIRTUAL_FOLDER     = doc
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
index 5488da6e58635a496cb89ffefa4d5c84633eb79d..405e6eb0ff518c6bb8efc23a39a1016ab0711286 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ protected:
 
 public:
 
-    //- Folder prefix
+    //- Directory prefix
     static const word outputPrefix;
 
     //- Additional characters for writing
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
index 8881eeb09403749ebbbca0b117b5097bfe6d9679..bd1c18e634da5cd9015bf5ff2943b15bb985fdd9 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
     This boundary condition provides a turbulent kinematic viscosity condition
     when using wall functions.  As input, the user specifies a look-up table
     of U+ as a function of near-wall Reynolds number.  The table should be
-    located in the $FOAM_CASE/constant folder.
+    located in the $FOAM_CASE/constant directory.
 
     \heading Patch usage
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
index 0680f6443bd44684eabd2a164b293fc6062dd12d..322ba3810b71d0bec8b025054b7893130baeecae 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Description
         ...
         <valueN> <gradientN> <valueFracionN>
 
-    Data is sent/received as a single file for all patches from the folder
+    Data is sent/received as a single file for all patches from the directory
 
         $FOAM_CASE/<commsDir>
 
@@ -75,7 +75,7 @@ Description
 
     \table
         Property     | Description             | Required    | Default value
-        commsDir     | communications folder   | yes         |
+        commsDir     | communications directory   | yes         |
         fileName     | transfer file name      | yes         |
         waitInterval | interval [s] between file checks | no | 1
         timeOut      | time after which error invoked [s] |no |100*waitInterval
@@ -135,7 +135,7 @@ private:
         typedef externalCoupledMixedFvPatchField<Type> patchType;
         typedef GeometricField<Type, fvPatchField, volMesh> volFieldType;
 
-        //- Path to communications folder
+        //- Path to communications directory
         fileName commsDir_;
 
         //- Name of data file
@@ -178,7 +178,7 @@ private:
         //- Set the master flag when collate option is selected
         void setMaster(const labelList& patchIDs);
 
-        //- Return the file path to the base communications folder
+        //- Return the file path to the base communications directory
         fileName baseDir() const;
 
         //- Write the geometry to the comms dir
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
index 74fa1f0b008d1de6b82dc8e634e8de7f9e13b023..0e6ec44ce8cd2c44c52ff0a8df70a6a38b047b0f 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
@@ -38,7 +38,7 @@ defineTypeNameAndDebug(writeDictionary, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-bool Foam::writeDictionary::tryFolder
+bool Foam::writeDictionary::tryDirectory
 (
     const label dictI,
     const word& location,
@@ -167,16 +167,16 @@ void Foam::writeDictionary::execute()
         }
         else
         {
-            bool processed = tryFolder(i, obr_.time().timeName(), firstDict);
+            bool processed = tryDirectory(i, obr_.time().timeName(), firstDict);
 
             if (!processed)
             {
-                processed = tryFolder(i, obr_.time().constant(), firstDict);
+                processed = tryDirectory(i, obr_.time().constant(), firstDict);
             }
 
             if (!processed)
             {
-                processed = tryFolder(i, obr_.time().system(), firstDict);
+                processed = tryDirectory(i, obr_.time().system(), firstDict);
             }
 
             if (!processed)
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
index a4ac474e40888edb30791d24bc4f1e6060ca539b..ac2ec7ac5878a00a14f24fff27fbca8dedf9d369 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ protected:
     // Private Member Functions
 
         //- Helper function to write the dictionary if found at location
-        bool tryFolder
+        bool tryDirectory
         (
             const label dictI,
             const word& location,
diff --git a/src/postProcessing/functionObjects/doc/functionObjects.dox b/src/postProcessing/functionObjects/doc/functionObjects.dox
index 94eb32bc4799b7d2b51b22c640cd94f7fd92be16..4fa79c730c1a63978b976666c180684901af3a43 100644
--- a/src/postProcessing/functionObjects/doc/functionObjects.dox
+++ b/src/postProcessing/functionObjects/doc/functionObjects.dox
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ Where:
 \endtable
 
 The sub-dictionary name \c myFunctionObject is chosen by the user, and is
-typically used as the name of the output folder for any derived data.  The
+typically used as the name of the output directory for any derived data.  The
 \c type entry defines the type of function object properties that follow.
 Since the function objects are packaged into separate libraries, the user must
 tell the code where to find the function object implementation, identified
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index 0c39404a93243c924f59fefa5ef6394ef9f57791..bf13dac4e4fb388167c06c342b99ed5b973c134e 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ Group
     grpFieldFunctionObjects
 
 Description
-    This function object reads fields from the time folders and adds them to
+    This function object reads fields from the time directories and adds them to
     the mesh database for further post-processing.
 
     Example of function object specification:
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
index c2927eaad5321ca76e31256594f37a812cf53310..b2171a1d67cb42fbd475a18e2d255e2da337a537 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ Group
 
 Description
     This function object evaluates and outputs the shear stress at wall
-    patches.  The result is written as a volVectorField to time folders as
+    patches.  The result is written as a volVectorField to time directories as
     field 'wallShearStress'
 
         \f[
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
index 94a2bb349a31ae03675382ca69f2116caf87c37d..004721a538adac7a96127b39b55ce557dc748ca7 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ Group
 
 Description
     Evaluates and outputs turbulence y+ for LES models.  Values written to
-    time folders as field 'yPlusLES'
+    time directories as field 'yPlusLES'
 
 SourceFiles
     yPlusLES.C
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
index 747f100ab4f163f62a2e2bf9224380c688e1c1d9..8a73cd47d593739964a43a45af51255d6746311b 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ Group
 
 Description
     Evaluates and outputs turbulence y+ for RAS models.  Values written to
-    time folders as field 'yPlusRAS'
+    time directories as field 'yPlusRAS'
 
 SourceFiles
     yPlusRAS.C
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index da97394dc499144a1f431f90e9521346750faaed..bc3afcd13f0c05ca43cd81aecae9a728368eb3a1 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -112,7 +112,9 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     {
-        pointPatchDist pDist(pointMesh::New(mesh), patchSet_, points0());
+        const pointMesh& pMesh = pointMesh::New(mesh);
+
+        pointPatchDist pDist(pMesh, patchSet_, points0());
 
         // Scaling: 1 up to di then linear down to 0 at do away from patches
         scale_.internalField() =
@@ -141,7 +143,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
                 scalar(1)
             );
 
-        scale_.correctBoundaryConditions();
+        pointConstraints::New(pMesh).constrain(scale_);
         scale_.write();
     }
 }
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
index 29c64541ac5f69813286e6a5a20b9700a8f84a64..3d17d955a69fbbe51a4259320679d6f0a6ad8ac8 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Description
         ...
         <valueN> <gradientN> <valueFracionN>
 
-    Data is sent/received as a single file for all patches from the folder
+    Data is sent/received as a single file for all patches from the directory
 
         $FOAM_CASE/<commsDir>
 
@@ -75,7 +75,7 @@ Description
 
     \table
         Property     | Description             | Required    | Default value
-        commsDir     | communications folder   | yes         |
+        commsDir     | communications directory   | yes         |
         fileName     | transfer file name      | yes         |
         waitInterval | interval [s] between file checks | no | 1
         timeOut      | time after which error invoked [s] |no |100*waitInterval
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
index dbc1a75ab738d91220b812dfeaccf514b116efbc..f4f3d9a8f324161e4d35d349665c646271fe89e5 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
     This boundary condition provides a turbulent kinematic viscosity condition
     when using wall functions.  As input, the user specifies a look-up table
     of U+ as a function of near-wall Reynolds number.  The table should be
-    located in the $FOAM_CASE/constant folder.
+    located in the $FOAM_CASE/constant directory.
 
     \heading Patch usage
 
diff --git a/tutorials/Alltest b/tutorials/Alltest
index 9a80b425e3f39018adccbe94df0e47072f5591a7..6d30a07e8c855e204db7c9df5d9b83ce35ba1a27 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -39,7 +39,7 @@ usage()
 usage: ${0##*/} [OPTION]
 
 options:
-  -root <dir>       specify root folder to run tests from
+  -root <dir>       specify root directory to run tests from
   -default          sets up a default scheme on all schemes
   -help             print the usage
 
diff --git a/tutorials/combustion/chemFoam/README b/tutorials/combustion/chemFoam/README
index 4af18c90e136f35b44b6c373f4939421f9822ba7..597d2b72d96a8e554f32f6a2325f577bd01093f0 100644
--- a/tutorials/combustion/chemFoam/README
+++ b/tutorials/combustion/chemFoam/README
@@ -5,7 +5,7 @@ h2     : H2 combustion, 10 species, 27 reactions
 nc7h16 : n-Heptane combustion, 544 species, 2446 reactions
 ic8h18 : iso-Octane combustion, 874 species, 3796 reactions
 
-Results interpreted in 'validation' sub-folder, where OpenFOAM results
+Results interpreted in 'validation' sub-directory, where OpenFOAM results
 are compared against those predicted by CHEMKIN II.
 
 Overall the best performing ODE solver is seulex followed closely by rodas23.
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
index d176101331549e10dde2294873a55606d8e47532..3cdb4dfc660934f2640849f8fa381fea4c111a2a 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -87,7 +87,7 @@ SETSDIR="../postProcessing/sets"
 
 if [ ! -d $SETSDIR ]
 then
-    echo "createGraphs: results sets not available in folder $SETSDIR"
+    echo "createGraphs: results sets not available in directory $SETSDIR"
     exit 0
 fi
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
index 71224edd24395e36208d23880ff216a999ede1f3..ceabeb37bdcf1e47fa8bc763956cf268c974d3df 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy propeller surface from resources folder
+# copy propeller surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
 
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
index 5a71c3e1b89b4da52c9b624b2fad5a978e155ae9..a38fa1edfac835bba424d9a06fd40346e0ff245c 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy motorbike surface from resources folder
+# copy motorbike surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 
 # Make dummy 0 directory
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README
index dbf3b73d5fcef61fd6dcf3c1225370b44a39bc00..de3f29cc01268a637d915dc6d9b8fb98400e9906 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
 
 The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
index e0102f95da61148486642f2d11c341c043e6a4fe..cd0a5ef76434796aad3682b0fd5b4a9eb83213f7 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-# Clean time folders only
+# Clean time directories only
 
 rm -rf *[1-9]*
 rm -f log.* 2>/dev/null
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 5275ea56bf3ad82f99374148f8d3f0ab8af319b4..75906bd525c7aa8e2f705cd847ece430b6655552 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy motorbike surface from resources folder
+# copy motorbike surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 runApplication surfaceFeatureExtract
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README b/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README
index dbf3b73d5fcef61fd6dcf3c1225370b44a39bc00..de3f29cc01268a637d915dc6d9b8fb98400e9906 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
 
 The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean
index 6ac02e9eab65bae4e3a6e69678372d9b9b15a274..71ba44f70cdf4160d9edbdc50e4f45c02c6bc137 100755
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove old time and post-processing folders
+# remove old time and post-processing directories
 rm -rf 0 *[1-9]* processor* postProcessing
 
 
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README b/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README
index dbf3b73d5fcef61fd6dcf3c1225370b44a39bc00..de3f29cc01268a637d915dc6d9b8fb98400e9906 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
 
 The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
index 3f107970554bb131912d53d98a9a8b3ae469a37c..7b653d8391b36e87891e120fce9705dfba9e5598 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
@@ -9,7 +9,7 @@ cleanCase
 # remove 0 directory
 rm -rf 0
 
-# remove post-processing folder
+# remove post-processing directory
 rm -rf postProcessing
 
 # copy 0.org to 0
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
index b0a57810b3083326f46ddf6fcde39a6988c1f28d..b3aa3f98f7f9b2f4f3c7e65705396b85cc493d6a 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove old time and post-processing folders
+# remove old time and post-processing directories
 rm -rf 0 *[1-9]* processor* postProcessing
 
 cleanCase
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
index d0839b002eb376e2de9b5aa131643eb374dcb7a2..921fd627a7ea0d598e8a22558691d67931ba8e9c 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove old time and post-processing folders
+# remove old time and post-processing directories
 rm -rf 0 *[1-9]* processor* postProcessing
 
 # copy 0.org to 0
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun b/tutorials/mesh/foamyHexMesh/blob/Allrun
index 3ef4e5b75e12b5550ea0f118190fb8c1473e727d..3e796d3215c12118358754025a1d3e6608fd9793 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy flange surface from resources folder
+# copy flange surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
 
 runApplication foamyHexMesh
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
index 1674277920df26e29974bc492a4ac7c8e4dbdb76..34ead2b03290f27b4e8c55c85ebddfd420bd96f8 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Get the number of processors to run on from system/decomposeParDict
 nProc=$(getNumberOfProcessors)
 
-# copy flange surface from resources folder
+# copy flange surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
 
 runApplication blockMesh -region backgroundMeshDecomposition
diff --git a/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/README b/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/README
index dbf3b73d5fcef61fd6dcf3c1225370b44a39bc00..de3f29cc01268a637d915dc6d9b8fb98400e9906 100644
--- a/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/README
+++ b/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
 
 The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun b/tutorials/mesh/foamyHexMesh/flange/Allrun
index 959eae6fd35131c8f94256d99102fc5a37861099..1038c97d0f23bdedf2a1dbae58a34927b424fe57 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy flange surface from resources folder
+# copy flange surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
 runApplication foamyHexMesh
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
index 8f33af0d7e13c4926bb343ecdeee6cdfa3d49173..8191bdc819e24c0f5e48046c82810d64dff7a90f 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Get the number of processors to run on from system/decomposeParDict
 nProc=$(getNumberOfProcessors)
 
-# copy flange surface from resources folder
+# copy flange surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
 # Create tight-fitting background mesh
diff --git a/tutorials/mesh/foamyHexMesh/flange/Alltest b/tutorials/mesh/foamyHexMesh/flange/Alltest
index c63a5906a23d52807efd664261e44dc223f3b261..184f94357608ccc5c4d163f8f6b492cb761633bb 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Alltest
+++ b/tutorials/mesh/foamyHexMesh/flange/Alltest
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy flange surface from resources folder
+# copy flange surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
 cp system/controlDict system/controlDict.org
diff --git a/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README b/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README
index dbf3b73d5fcef61fd6dcf3c1225370b44a39bc00..de3f29cc01268a637d915dc6d9b8fb98400e9906 100644
--- a/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README
+++ b/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
 
 The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/mesh/snappyHexMesh/flange/Allrun b/tutorials/mesh/snappyHexMesh/flange/Allrun
index 365020d19d52b7c3652ba808d37bc7660ad72916..49602feb6e7ad89f00a55e13ce697b4f0316ddd5 100755
--- a/tutorials/mesh/snappyHexMesh/flange/Allrun
+++ b/tutorials/mesh/snappyHexMesh/flange/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy flange surface from resources folder
+# copy flange surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
 runApplication blockMesh
diff --git a/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README b/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README
index dbf3b73d5fcef61fd6dcf3c1225370b44a39bc00..de3f29cc01268a637d915dc6d9b8fb98400e9906 100644
--- a/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README
+++ b/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
 
 The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
index 2924a2cd45d243fa19a6314fc36a6a2b52e0be67..f57a6542d2a135d0ed6e15342ccb82e4ab9f3a44 100755
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy wigley surface from resources folder
+# copy wigley surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/wigley-scaled-oriented.stl.gz constant/triSurface/
 
 runApplication blockMesh
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/triSurface/README b/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/triSurface/README
index dbf3b73d5fcef61fd6dcf3c1225370b44a39bc00..de3f29cc01268a637d915dc6d9b8fb98400e9906 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/triSurface/README
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
 
 The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
index 865aff56b8c67e2c01470ca9c83747f7f8439e1a..b8d2f2caa33d8e8aa273d9d0a964e96cdf3d012c 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
@@ -38,7 +38,7 @@ boundaryField
 
     outlet
     {
-        type            inletOutlet;
+        type            pressureInletOutletVelocity;
         inletValue      uniform (0 0 0);
         value           uniform (0 0 0);
     }
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
index c40de26d4b50b508be2ec6b5c57def59d3a5f24c..e89c0586e6556268587c32622808d9fd32fce173 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
@@ -31,7 +31,13 @@ boundaryField
 
     outlet
     {
-        type            fixedValue;
+        type            totalPressure;
+        p0              $internalField;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
         value           $internalField;
     }
 
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
index a5ed0514a9cb20be293009efd6557e1a6484cdf7..754315442fc53d0b68a2edb947bd2d59acf7d0c5 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy propeller surface from resources folder
+# copy propeller surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
 
 
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
index 269adf2b4fbc4547c8ddfa29d4c104fd4858eb49..a121b19ddf1ae620f7dc8b1db47be23a33a6fed3 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
@@ -23,7 +23,7 @@ libs
 
 application     interPhaseChangeDyMFoam;
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 
@@ -54,6 +54,6 @@ runTimeModifiable true;
 adjustTimeStep  yes;
 
 maxCo           2;
-maxAlphaCo      2;
+maxAlphaCo      1;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
index bc5e84cf8537286f530c93eec83a04e88a846e4b..6fbe8482e0cbbcd1d87cfc4f5f5dad21a5cb3b14 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
@@ -30,6 +30,7 @@ solvers
         tolerance       1e-8;
         relTol          0;
         maxIter         10;
+        minIter         1;
     };
 
     "pcorr.*"
@@ -65,12 +66,12 @@ solvers
         smoother        symGaussSeidel;
         tolerance       1e-6;
         relTol          0.1;
+        minIter         1;
     }
 
     "(U|k|epsilon)Final"
     {
         $U;
-        tolerance       1e-6;
         relTol          0;
     }
 }
@@ -78,8 +79,8 @@ solvers
 PIMPLE
 {
     correctPhi          yes;
-    nOuterCorrectors    1;
-    nCorrectors         3;
+    nOuterCorrectors    3;
+    nCorrectors         1;
     nNonOrthogonalCorrectors 0;
 }
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
index 1b52d0a3a6f5ccdfb781e6da5548eedba380a210..abd6a03a3534c6d2c388fb146cf9cf0efbc52f43 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# copy bullet surface from resources folder
+# copy bullet surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/bullet.stl.gz constant/triSurface/
 
 # Generate the base block mesh
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/triSurface/README b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/triSurface/README
index dbf3b73d5fcef61fd6dcf3c1225370b44a39bc00..de3f29cc01268a637d915dc6d9b8fb98400e9906 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/triSurface/README
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
 
 The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
index e0102f95da61148486642f2d11c341c043e6a4fe..cd0a5ef76434796aad3682b0fd5b4a9eb83213f7 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-# Clean time folders only
+# Clean time directories only
 
 rm -rf *[1-9]*
 rm -f log.* 2>/dev/null