diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index d1709c44b..0af33e381 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -32,13 +32,6 @@ Description
     field and derived quantities.  Alternatively, the same actions can be
     executed after the simulation using the \c execFlowFunctionObjects utility.
 
-    \linebreak
-    The current range of features are sub-divided into the following categories:
-    - \ref grpLagrangianFunctionObjects
-    - \ref grpFieldFunctionObjects
-    - \ref grpForcesFunctionObjects
-    - \ref grpUtilitiesFunctionObjects
-
     \linebreak
     \subsection secFunctionObjects Using function objects
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObjectsDoc.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObjectsDoc.H
index 2e0930123..e46859e3d 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObjectsDoc.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObjectsDoc.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,9 +23,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpFunctionObjects Function objects
+\defgroup grpFunctionObjects FunctionObjects
 @{
-    This group contains function objects
+    FunctionObjects are in the Foam::functionObjects namespace
 @}
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/global/foamDoc.H b/src/OpenFOAM/global/foamDoc.H
index 4f92fa4d2..46b69ff11 100644
--- a/src/OpenFOAM/global/foamDoc.H
+++ b/src/OpenFOAM/global/foamDoc.H
@@ -53,7 +53,7 @@ License
 
 \section usingOpenFOAM Using OpenFOAM
 
-    - \subpage pagePostProcessing
-    - Post-processing using Foam::functionObjects
+    - \ref grpFunctionObjects namespace Foam::functionObjects
+    - \subpage pageBoundaryConditions
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
index 3219fe22d..0e145a38c 100644
--- a/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
@@ -25,7 +25,7 @@ Class
     Foam::functionObjects::systemCall
 
 Group
-    grpFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     This function object executes system calls, entered in the form of a
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 18de7b515..55ffc6256 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -25,7 +25,7 @@ Class
     Foam::probes
 
 Group
-    grpFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     Set of locations to sample.
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index 56a63b2f2..7623524f8 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -25,7 +25,7 @@ Class
     Foam::sampledSet
 
 Group
-    grpFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     Holds list of sampling points which is filled at construction time.
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
index 0fdcca5dd..0507a6887 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
@@ -25,7 +25,7 @@ Class
     Foam::sampledSurface
 
 Group
-    grpFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     An abstract class for surfaces with sampling.