diff --git a/etc/config.csh/example/compiler b/etc/config.csh/example/compiler
index 607f780fff..dc3fa77ae6 100644
--- a/etc/config.csh/example/compiler
+++ b/etc/config.csh/example/compiler
@@ -19,7 +19,7 @@
 #------------------------------------------------------------------------------
 
 # Load the standard versions
-eval `$WM_PROJECT_DIR/bin/foamEtcFile -mode=o -csh -config compiler`
+eval `$WM_PROJECT_DIR/bin/foamEtcFile -csh -config -mode=o compiler`
 
 # Modify/override compiler settings
 switch ("$WM_COMPILER")
diff --git a/etc/config.csh/example/paraview b/etc/config.csh/example/paraview
index ce07cea7c2..3a05c0b408 100644
--- a/etc/config.csh/example/paraview
+++ b/etc/config.csh/example/paraview
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -23,9 +23,7 @@
 #------------------------------------------------------------------------------
 
 # Use standard paraview config file (-mode=o) with a different ParaView_VERSION
-set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.csh/paraview`
-if ( $status == 0 ) source $foamFile ParaView_VERSION=5.4.0
 
-unset foamFile
+eval `foamEtcFile -csh -config -mode=o paraview -- ParaView_VERSION=5.5.0-mpipy`
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/example/compiler b/etc/config.sh/example/compiler
index 3d3d748b4d..995ad71daf 100644
--- a/etc/config.sh/example/compiler
+++ b/etc/config.sh/example/compiler
@@ -19,7 +19,7 @@
 #------------------------------------------------------------------------------
 
 # Load the standard versions
-eval $($WM_PROJECT_DIR/bin/foamEtcFile -mode=o -sh -config compiler)
+eval $($WM_PROJECT_DIR/bin/foamEtcFile -sh -config -mode=o compiler)
 
 # Modify/override compiler settings
 case "$WM_COMPILER" in
diff --git a/etc/config.sh/example/paraview b/etc/config.sh/example/paraview
index 88ae895f8f..fa88c14122 100644
--- a/etc/config.sh/example/paraview
+++ b/etc/config.sh/example/paraview
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -24,9 +24,6 @@
 
 # Use standard paraview config file (-mode=o) with a different ParaView_VERSION
 
-foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.sh/paraview 2>/dev/null)
-[ $? -eq 0 ] && . $foamFile ParaView_VERSION=5.4.0
-
-unset foamFile
+eval $(foamEtcFile -sh -config -mode=o paraview -- ParaView_VERSION=5.5.0-mpipy)
 
 #------------------------------------------------------------------------------