diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 1bdbe8baf4f968df56871590ab64210b35129831..cebe442ca0633adaded108431acdb62ff46e2026 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -191,7 +191,7 @@ void print(Ostream& os, const wordList& flds)
 labelList getSelectedPatches
 (
     const polyBoundaryMesh& patches,
-    const List<wordRe>& excludePatches  //HashSet<word>& excludePatches
+    const List<wordRe>& excludePatches
 )
 {
     DynamicList<label> patchIDs(patches.size());
@@ -205,7 +205,7 @@ labelList getSelectedPatches
         if
         (
             isType<emptyPolyPatch>(pp)
-            || (Pstream::parRun() && isType<processorPolyPatch>(pp))
+         || (Pstream::parRun() && isType<processorPolyPatch>(pp))
         )
         {
             Info<< "    discarding empty/processor patch " << patchi
diff --git a/src/postProcessing/functionObjects/doc/functionObjects.dox b/src/postProcessing/functionObjects/doc/functionObjects.dox
index 4fa79c730c1a63978b976666c180684901af3a43..5cab990a613f7ec2014b01c7f10147da7bd6d863 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-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,12 +36,9 @@ utility.
 
 \linebreak
 The current range of features comprises of:
-- \ref grpCloudFunctionObjects
+- \ref grpLagrangianFunctionObjects
 - \ref grpFieldFunctionObjects
 - \ref grpForcesFunctionObjects
-- \ref grpFVFunctionObjects
-- \ref grpIOFunctionObjects
-- \ref grpJobControlFunctionObjects
 - \ref grpUtilitiesFunctionObjects
 
 \linebreak
@@ -78,7 +75,7 @@ Where:
     region   | name of region for multi-region cases | no       |
     enabled  | on/off switch                         | no       | yes
     timeStart| start time                            | no       |
-    timeEnd  | end time                              | no       | 
+    timeEnd  | end time                              | no       |
     outputControl | when to output: either 'outputTime' or 'timeStep'| no | timeStep
     outputInterval| steps between output when outputControl=timeStep | no | 1
 \endtable
@@ -88,7 +85,7 @@ 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
-using the \c libs entry.  
+using the \c libs entry.
 
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/field/div/div.H b/src/postProcessing/functionObjects/field/div/div.H
index 8fe81600fe04f15c5b454e64cda366f15b3f8d7d..97f96b0a201b20e3d6ba94c088f36eb73fc4b767 100644
--- a/src/postProcessing/functionObjects/field/div/div.H
+++ b/src/postProcessing/functionObjects/field/div/div.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::div
 
 Group
-    grpFVFunctionObjects
+    grpFieldFunctionObjects
 
 Description
     This function object calculates the divergence of a field.  The operation is
diff --git a/src/postProcessing/functionObjects/field/grad/grad.H b/src/postProcessing/functionObjects/field/grad/grad.H
index d017c57f48ccdd57f877a9889684c8f84adeac81..124c6760374351df3685798792edbf7bdc0ab528 100644
--- a/src/postProcessing/functionObjects/field/grad/grad.H
+++ b/src/postProcessing/functionObjects/field/grad/grad.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::grad
 
 Group
-    grpFVFunctionObjects
+    grpFieldFunctionObjects
 
 Description
     This function object calculates the gradient of a field.  The operation is
diff --git a/src/postProcessing/functionObjects/field/mag/mag.H b/src/postProcessing/functionObjects/field/mag/mag.H
index 13de0cc0745487db98b65e67e3d8c93901c2b142..934b906e1652e28805f74afbcec4739069ad555b 100644
--- a/src/postProcessing/functionObjects/field/mag/mag.H
+++ b/src/postProcessing/functionObjects/field/mag/mag.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::mag
 
 Group
-    grpFVFunctionObjects
+    grpFieldFunctionObjects
 
 Description
     This function object calculates the magnitude of a field.  The operation
diff --git a/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
index 67a04f8466a79ce6fa16a3312afe8e8f1b8f589b..9270d67fee79137d78c7c4454812944c89d7f54a 100644
--- a/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
+++ b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::pressureTools
 
 Group
-    grpUtilitiesFunctionObjects
+    grpForcesFunctionObjects
 
 Description
     This function object includes tools to manipulate the pressure into
diff --git a/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
index cd00e7246604e6ecf8732911b7a86eeb2b656c1a..3fa7f2a96ab726c8bb1209a0f1f2f1bb94bac09d 100644
--- a/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::wallShearStress
 
 Group
-    grpUtilitiesFunctionObjects
+    grpForcesFunctionObjects
 
 Description
     This function object evaluates and outputs the shear stress at wall
diff --git a/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
index 54c119cb2b55730a56b7b17bff217b72f12cfa7c..5361877799fa9878ae17ba0857ff99f76636aef4 100644
--- a/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
+++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::cloudInfo
 
 Group
-    grpCloudFunctionObjects
+    grpLagrangianFunctionObjects
 
 Description
     This function object outputs Lagrangian cloud information to a file.  The
diff --git a/src/postProcessing/functionObjects/utilities/abort/abort.H b/src/postProcessing/functionObjects/utilities/abort/abort.H
index 4224d980bbeb05dbaf5c398d2bcf19c076e32a1f..1cb6a47f76bebaa4b41d21356f52df4124a4d535 100644
--- a/src/postProcessing/functionObjects/utilities/abort/abort.H
+++ b/src/postProcessing/functionObjects/utilities/abort/abort.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::abort
 
 Group
-    grpJobControlFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     Watches for presence of the named file in the $FOAM_CASE directory
diff --git a/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
index e5ba6ff936274471c9c73afb424a28ddd4b1bb79..800bbcb17a6c134618adab01eb868e30718548fb 100644
--- a/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::partialWrite
 
 Group
-    grpIOFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     This function object allows user-selected fields/registered objects to be
diff --git a/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
index b8a7da75bba30c69570dd6c820c665f5cdea7a2e..5b1953430984f220716a147e417b7a48f2f4caf0 100644
--- a/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::removeRegisteredObject
 
 Group
-    grpIOFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     This function object removes registered objects if present in the database
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
index efae29d0459bdf09fde6adc4d8221b4bcb0bfbbc..4a34dccc3ca4db862397647cfec764ee02307e9c 100644
--- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::writeRegisteredObject
 
 Group
-    grpIOFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     This function object allows specification of different writing frequency