diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
index 26d8b065c8..b36cf66ad4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
@@ -36,12 +36,12 @@ using namespace Foam;
 template<class Type>
 void ensightCloudField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
-    const Foam::word& cloudName,
-    Foam::Ostream& ensightCaseFile,
+    const IOobject& fieldObject,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
+    const word& cloudName,
+    Ostream& ensightCaseFile,
     const bool dataExists
 )
 {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
index 376e537037..8a624c11ee 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
@@ -42,13 +42,13 @@ SourceFiles
 template<class Type>
 void ensightCloudField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
-    const Foam::word& timeFile,
-    const Foam::word& cloudName,
-    Foam::Ostream& ensightCaseFile,
+    const IOobject& fieldObject,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
+    const word& timeFile,
+    const word& cloudName,
+    Ostream& ensightCaseFile,
     const bool dataExists
 );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index 5434209711..b9cb04b0d6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -105,11 +105,11 @@ void writeField
 template<class Type>
 bool writePatchField
 (
-    const Foam::Field<Type>& pf,
-    const Foam::label patchi,
-    const Foam::label ensightPatchI,
-    const Foam::faceSets& boundaryFaceSet,
-    const Foam::ensightMesh::nFacePrimitives& nfp,
+    const Field<Type>& pf,
+    const label patchi,
+    const label ensightPatchI,
+    const faceSets& boundaryFaceSet,
+    const ensightMesh::nFacePrimitives& nfp,
     ensightStream& ensightFile
 )
 {
@@ -153,15 +153,15 @@ bool writePatchField
 template<class Type>
 void writePatchField
 (
-    const Foam::word& fieldName,
-    const Foam::Field<Type>& pf,
-    const Foam::word& patchName,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const word& fieldName,
+    const Field<Type>& pf,
+    const word& patchName,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     const Time& runTime = eMesh.mesh().time();
@@ -271,12 +271,12 @@ template<class Type>
 void ensightField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     Info<< "Converting field " << vf.name() << endl;
@@ -500,12 +500,12 @@ template<class Type>
 void ensightPointField
 (
     const GeometricField<Type, pointPatchField, pointMesh>& pf,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     Info<< "Converting field " << pf.name() << endl;
@@ -679,14 +679,14 @@ void ensightPointField
 template<class Type>
 void ensightField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const IOobject& fieldObject,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
     const bool nodeValues,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     // Read field
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
index 20bb59b72a..bd23d234a4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
@@ -37,10 +37,10 @@ using namespace Foam;
 
 void ensightParticlePositions
 (
-    const Foam::fvMesh& mesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& timeFile,
-    const Foam::word& cloudName,
+    const fvMesh& mesh,
+    const fileName& postProcPath,
+    const word& timeFile,
+    const word& cloudName,
     const bool dataExists
 )
 {