diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 5e659fcce2..f233e37a7f 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,7 @@ Description
 #include "fft.H"
 #include "calcEk.H"
 #include "graph.H"
+#include "writeFile.H"
 #include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -117,7 +118,10 @@ int main(int argc, char *argv[])
         {
             calcEk(U, K).write
             (
-                runTime.path()/"graphs"/runTime.timeName(),
+                runTime.path()
+               /functionObjects::writeFile::outputPrefix
+               /"graphs"
+               /runTime.timeName(),
                 "Ek",
                 runTime.graphFormat()
             );
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H b/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H
index 885ebb4805..ceaf75e476 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H
@@ -1,4 +1,11 @@
-    fileName path(UMean.rootPath()/UMean.caseName()/"graphs"/UMean.instance());
+    fileName path
+    (
+        UMean.rootPath()
+       /UMean.caseName()
+       /functionObjects::writeFile::outputPrefix
+       /"graphs"
+       /UMean.instance()
+    );
     mkDir(path);
 
     scalarField UMeanXvalues
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
index 25965647d1..ea9d858233 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
@@ -39,6 +39,7 @@ Description
 #include "volFields.H"
 #include "channelIndex.H"
 #include "makeGraph.H"
+#include "writeFile.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index d44260d848..f0dd2d7f1b 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,7 @@ Description
 #include "Kmesh.H"
 #include "turbGen.H"
 #include "calcEk.H"
+#include "writeFile.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,7 +70,10 @@ int main(int argc, char *argv[])
 
     calcEk(U, K).write
     (
-        runTime.path()/"graphs"/runTime.timeName(),
+        runTime.path()
+       /functionObjects::writeFile::outputPrefix
+       /"graphs"
+       /runTime.timeName(),
         "Ek",
         runTime.graphFormat()
     );
diff --git a/src/sampling/graphField/makeGraph.C b/src/sampling/graphField/makeGraph.C
index 67620e0d35..75853bd2c6 100644
--- a/src/sampling/graphField/makeGraph.C
+++ b/src/sampling/graphField/makeGraph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,7 @@ Description
 #include "volFields.H"
 #include "fvMesh.H"
 #include "graph.H"
+#include "writeFile.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,7 +63,14 @@ void makeGraph
     const word& graphFormat
 )
 {
-    fileName path(vsf.rootPath()/vsf.caseName()/"graphs"/vsf.instance());
+    fileName path
+    (
+        vsf.rootPath()
+       /vsf.caseName()
+       /functionObjects::writeFile::outputPrefix
+       /"graphs"
+       /vsf.instance()
+    );
     mkDir(path);
 
     makeGraph
diff --git a/src/sampling/graphField/writeCellGraph.C b/src/sampling/graphField/writeCellGraph.C
index 535e2c3434..bdb9c9dd44 100644
--- a/src/sampling/graphField/writeCellGraph.C
+++ b/src/sampling/graphField/writeCellGraph.C
@@ -1,7 +1,33 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2019 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/>.
+
+\*---------------------------------------------------------------------------*/
+
 #include "writeCellGraph.H"
 #include "volFields.H"
 #include "fvMesh.H"
 #include "graph.H"
+#include "writeFile.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -16,7 +42,13 @@ void writeCellGraph
     const word& graphFormat
 )
 {
-    fileName path(vsf.time().path()/"graphs"/vsf.time().timeName());
+    fileName path
+    (
+        vsf.time().path()
+       /functionObjects::writeFile::outputPrefix
+       /"graphs"
+       /vsf.time().timeName()
+    );
     mkDir(path);
 
     graph
@@ -29,7 +61,6 @@ void writeCellGraph
     ).write(path/vsf.name(), graphFormat);
 }
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/sampling/graphField/writePatchGraph.C b/src/sampling/graphField/writePatchGraph.C
index 9b9627f502..30c42b8408 100644
--- a/src/sampling/graphField/writePatchGraph.C
+++ b/src/sampling/graphField/writePatchGraph.C
@@ -1,9 +1,33 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2019 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/>.
+
+\*---------------------------------------------------------------------------*/
+
 #include "writePatchGraph.H"
 #include "volFields.H"
 #include "fvMesh.H"
 #include "graph.H"
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -29,7 +53,6 @@ void writePatchGraph
     ).write(vsf.time().timePath()/vsf.name(), graphFormat);
 }
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allclean b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
index be0857f151..14375ff1df 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allclean
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf 0/enstrophy graphs
+rm -rf 0/enstrophy
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
index e0ed3f7a52..141356fa47 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
@@ -6,7 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-rm -rf graphs
 rm -f *.eps yPlus_vs_uPlus
 
 #------------------------------------------------------------------------------