diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C
similarity index 90%
rename from src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C
rename to src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C
index 3f31f8d4fe..caff65a7db 100644
--- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "foamFileSurfaceWriter.H"
+#include "foamSurfaceWriter.H"
 
 #include "OFstream.H"
 #include "OSspecific.H"
@@ -34,14 +34,14 @@ License
 
 namespace Foam
 {
-    makeSurfaceWriterType(foamFileSurfaceWriter);
+    makeSurfaceWriterType(foamSurfaceWriter);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::foamFileSurfaceWriter::writeTemplate
+void Foam::foamSurfaceWriter::writeTemplate
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -83,7 +83,7 @@ void Foam::foamFileSurfaceWriter::writeTemplate
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamFileSurfaceWriter::foamFileSurfaceWriter()
+Foam::foamSurfaceWriter::foamSurfaceWriter()
 :
     surfaceWriter()
 {}
@@ -91,13 +91,13 @@ Foam::foamFileSurfaceWriter::foamFileSurfaceWriter()
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamFileSurfaceWriter::~foamFileSurfaceWriter()
+Foam::foamSurfaceWriter::~foamSurfaceWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::foamFileSurfaceWriter::write
+void Foam::foamSurfaceWriter::write
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -138,8 +138,8 @@ void Foam::foamFileSurfaceWriter::write
 }
 
 
-// create write methods
-defineSurfaceWriterWriteFields(Foam::foamFileSurfaceWriter);
+// Create write methods
+defineSurfaceWriterWriteFields(Foam::foamSurfaceWriter);
 
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H
similarity index 93%
rename from src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
rename to src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H
index 254dadcb44..5cdae7abe1 100644
--- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,18 +22,18 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamFileSurfaceWriter
+    Foam::foamSurfaceWriter
 
 Description
-    A surfaceWriter for foamFiles
+    A surfaceWriter for foams
 
 SourceFiles
-    foamFileSurfaceWriter.C
+    foamSurfaceWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef foamFileSurfaceWriter_H
-#define foamFileSurfaceWriter_H
+#ifndef foamSurfaceWriter_H
+#define foamSurfaceWriter_H
 
 #include "surfaceWriter.H"
 
@@ -43,10 +43,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class foamFileSurfaceWriter Declaration
+                    Class foamSurfaceWriter Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamFileSurfaceWriter
+class foamSurfaceWriter
 :
     public surfaceWriter
 {
@@ -70,17 +70,17 @@ class foamFileSurfaceWriter
 public:
 
     //- Runtime type information
-    TypeName("foamFile");
+    TypeName("foam");
 
 
     // Constructors
 
         //- Construct null
-        foamFileSurfaceWriter();
+        foamSurfaceWriter();
 
 
     //- Destructor
-    virtual ~foamFileSurfaceWriter();
+    virtual ~foamSurfaceWriter();
 
 
     // Member Functions
@@ -172,7 +172,6 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const;
-
 };