diff --git a/src/functionObjects/field/interfaceHeight/interfaceHeight.C b/src/functionObjects/field/interfaceHeight/interfaceHeight.C
index 1ec9c3dc0..7cb3ccdfe 100644
--- a/src/functionObjects/field/interfaceHeight/interfaceHeight.C
+++ b/src/functionObjects/field/interfaceHeight/interfaceHeight.C
@@ -28,7 +28,7 @@ License
 #include "interpolation.H"
 #include "IOmanip.H"
 #include "meshSearch.H"
-#include "lineCellFaceSet.H"
+#include "lineCellFace.H"
 #include "Time.H"
 #include "uniformDimensionedFields.H"
 #include "volFields.H"
@@ -72,7 +72,7 @@ void Foam::functionObjects::interfaceHeight::writePositions()
     forAll(locations_, li)
     {
         // Create a set along a ray projected in the direction of gravity
-        const lineCellFaceSet set
+        const sampledSets::lineCellFace set
         (
             "",
             mesh_,
diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index 60c824d7c..31fe506ae 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -5,18 +5,18 @@ probes/probesGrouping.C
 sampledSet/sampledSet/sampledSet.C
 sampledSet/sampledSets/sampledSets.C
 sampledSet/sampledSets/sampledSetsGrouping.C
-sampledSet/arcUniform/arcUniformSet.C
-sampledSet/boxUniform/boxUniformSet.C
-sampledSet/circleRandom/circleRandomSet.C
-sampledSet/lineCell/lineCellSet.C
-sampledSet/lineCellFace/lineCellFaceSet.C
-sampledSet/lineFace/lineFaceSet.C
-sampledSet/lineUniform/lineUniformSet.C
-sampledSet/boundaryPoints/boundaryPointsSet.C
-sampledSet/boundaryRandom/boundaryRandomSet.C
-sampledSet/points/pointsSet.C
-sampledSet/sphereRandom/sphereRandomSet.C
-sampledSet/triSurfaceMesh/triSurfaceMeshSet.C
+sampledSet/arcUniform/arcUniform.C
+sampledSet/boxUniform/boxUniform.C
+sampledSet/circleRandom/circleRandom.C
+sampledSet/lineCell/lineCell.C
+sampledSet/lineCellFace/lineCellFace.C
+sampledSet/lineFace/lineFace.C
+sampledSet/lineUniform/lineUniform.C
+sampledSet/boundaryPoints/boundaryPoints.C
+sampledSet/boundaryRandom/boundaryRandom.C
+sampledSet/points/points.C
+sampledSet/sphereRandom/sphereRandom.C
+sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
 
 cuttingPlane/cuttingPlane.C
 
diff --git a/src/sampling/sampledSet/arcUniform/arcUniformSet.C b/src/sampling/sampledSet/arcUniform/arcUniform.C
similarity index 92%
rename from src/sampling/sampledSet/arcUniform/arcUniformSet.C
rename to src/sampling/sampledSet/arcUniform/arcUniform.C
index 0957f4f30..0fe6cc193 100644
--- a/src/sampling/sampledSet/arcUniform/arcUniformSet.C
+++ b/src/sampling/sampledSet/arcUniform/arcUniform.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "arcUniformSet.H"
+#include "arcUniform.H"
 #include "sampledSet.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
@@ -36,14 +36,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(arcUniformSet, 0);
-    addToRunTimeSelectionTable(sampledSet, arcUniformSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(arcUniform, 0);
+    addToRunTimeSelectionTable(sampledSet, arcUniform, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::arcUniformSet::calcSamples
+void Foam::sampledSets::arcUniform::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -77,7 +80,7 @@ void Foam::arcUniformSet::calcSamples
 }
 
 
-void Foam::arcUniformSet::genSamples()
+void Foam::sampledSets::arcUniform::genSamples()
 {
     // Storage for sample points
     DynamicList<point> samplingPts;
@@ -114,7 +117,7 @@ void Foam::arcUniformSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::arcUniformSet::arcUniformSet
+Foam::sampledSets::arcUniform::arcUniform
 (
     const word& name,
     const polyMesh& mesh,
@@ -141,7 +144,7 @@ Foam::arcUniformSet::arcUniformSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::arcUniformSet::~arcUniformSet()
+Foam::sampledSets::arcUniform::~arcUniform()
 {}
 
 
diff --git a/src/sampling/sampledSet/arcUniform/arcUniformSet.H b/src/sampling/sampledSet/arcUniform/arcUniform.H
similarity index 94%
rename from src/sampling/sampledSet/arcUniform/arcUniformSet.H
rename to src/sampling/sampledSet/arcUniform/arcUniform.H
index 56c6ec485..81fee73c3 100644
--- a/src/sampling/sampledSet/arcUniform/arcUniformSet.H
+++ b/src/sampling/sampledSet/arcUniform/arcUniform.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::arcUniformSet
+    Foam::sampledSets::arcUniform
 
 Description
     Uniform samples along an arc
@@ -54,12 +54,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    arcUniformSet.C
+    arcUniform.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef arcUniformSet_H
-#define arcUniformSet_H
+#ifndef arcUniform_H
+#define arcUniform_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -68,12 +68,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                          Class arcUniformSet Declaration
+                          Class arcUniform Declaration
 \*---------------------------------------------------------------------------*/
 
-class arcUniformSet
+class arcUniform
 :
     public sampledSet
 {
@@ -125,7 +127,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        arcUniformSet
+        arcUniform
         (
             const word& name,
             const polyMesh& mesh,
@@ -135,12 +137,13 @@ public:
 
 
     // Destructor
-    virtual ~arcUniformSet();
+    virtual ~arcUniform();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/boundaryPoints/boundaryPointsSet.C b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.C
similarity index 95%
rename from src/sampling/sampledSet/boundaryPoints/boundaryPointsSet.C
rename to src/sampling/sampledSet/boundaryPoints/boundaryPoints.C
index 61a25e1e8..f7ba96382 100644
--- a/src/sampling/sampledSet/boundaryPoints/boundaryPointsSet.C
+++ b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "boundaryPointsSet.H"
+#include "boundaryPoints.H"
 #include "polyMesh.H"
 #include "addToRunTimeSelectionTable.H"
 #include "treeBoundBox.H"
@@ -36,14 +36,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(boundaryPointsSet, 0);
-    addToRunTimeSelectionTable(sampledSet, boundaryPointsSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(boundaryPoints, 0);
+    addToRunTimeSelectionTable(sampledSet, boundaryPoints, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::boundaryPointsSet::calcSamples
+void Foam::sampledSets::boundaryPoints::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -188,7 +191,7 @@ void Foam::boundaryPointsSet::calcSamples
 }
 
 
-void Foam::boundaryPointsSet::genSamples()
+void Foam::sampledSets::boundaryPoints::genSamples()
 {
     DynamicList<point> samplingPts;
     DynamicList<label> samplingCells;
@@ -224,7 +227,7 @@ void Foam::boundaryPointsSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::boundaryPointsSet::boundaryPointsSet
+Foam::sampledSets::boundaryPoints::boundaryPoints
 (
     const word& name,
     const polyMesh& mesh,
@@ -254,7 +257,7 @@ Foam::boundaryPointsSet::boundaryPointsSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::boundaryPointsSet::~boundaryPointsSet()
+Foam::sampledSets::boundaryPoints::~boundaryPoints()
 {}
 
 
diff --git a/src/sampling/sampledSet/boundaryPoints/boundaryPointsSet.H b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H
similarity index 92%
rename from src/sampling/sampledSet/boundaryPoints/boundaryPointsSet.H
rename to src/sampling/sampledSet/boundaryPoints/boundaryPoints.H
index ef4c267a8..57cb614d4 100644
--- a/src/sampling/sampledSet/boundaryPoints/boundaryPointsSet.H
+++ b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::boundaryPointsSet
+    Foam::sampledSets::boundaryPoints
 
 Description
     Specified point samples within patches
@@ -54,12 +54,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    boundaryPointsSet.C
+    boundaryPoints.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef boundaryPointsSet_H
-#define boundaryPointsSet_H
+#ifndef boundaryPoints_H
+#define boundaryPoints_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -69,12 +69,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                        Class boundaryPointsSet Declaration
+                        Class boundaryPoints Declaration
 \*---------------------------------------------------------------------------*/
 
-class boundaryPointsSet
+class boundaryPoints
 :
     public sampledSet
 {
@@ -115,7 +117,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        boundaryPointsSet
+        boundaryPoints
         (
             const word& name,
             const polyMesh& mesh,
@@ -125,12 +127,13 @@ public:
 
 
     //- Destructor
-    virtual ~boundaryPointsSet();
+    virtual ~boundaryPoints();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/boundaryRandom/boundaryRandomSet.C b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
similarity index 94%
rename from src/sampling/sampledSet/boundaryRandom/boundaryRandomSet.C
rename to src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
index c26707c57..ff7aca5b0 100644
--- a/src/sampling/sampledSet/boundaryRandom/boundaryRandomSet.C
+++ b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "boundaryRandomSet.H"
+#include "boundaryRandom.H"
 #include "sampledSet.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
@@ -39,14 +39,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(boundaryRandomSet, 0);
-    addToRunTimeSelectionTable(sampledSet, boundaryRandomSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(boundaryRandom, 0);
+    addToRunTimeSelectionTable(sampledSet, boundaryRandom, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::boundaryRandomSet::calcSamples
+void Foam::sampledSets::boundaryRandom::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -175,7 +178,7 @@ void Foam::boundaryRandomSet::calcSamples
 }
 
 
-void Foam::boundaryRandomSet::genSamples()
+void Foam::sampledSets::boundaryRandom::genSamples()
 {
     // Storage for sample points
     DynamicList<point> samplingPts;
@@ -212,7 +215,7 @@ void Foam::boundaryRandomSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::boundaryRandomSet::boundaryRandomSet
+Foam::sampledSets::boundaryRandom::boundaryRandom
 (
     const word& name,
     const polyMesh& mesh,
@@ -241,7 +244,7 @@ Foam::boundaryRandomSet::boundaryRandomSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::boundaryRandomSet::~boundaryRandomSet()
+Foam::sampledSets::boundaryRandom::~boundaryRandom()
 {}
 
 
diff --git a/src/sampling/sampledSet/boundaryRandom/boundaryRandomSet.H b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H
similarity index 91%
rename from src/sampling/sampledSet/boundaryRandom/boundaryRandomSet.H
rename to src/sampling/sampledSet/boundaryRandom/boundaryRandom.H
index 30e6e7658..48f8f8525 100644
--- a/src/sampling/sampledSet/boundaryRandom/boundaryRandomSet.H
+++ b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::boundaryRandomSet
+    Foam::sampledSets::boundaryRandom
 
 Description
     Random samples within patches
@@ -46,12 +46,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    boundaryRandomSet.C
+    boundaryRandom.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef boundaryRandomSet_H
-#define boundaryRandomSet_H
+#ifndef boundaryRandom_H
+#define boundaryRandom_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -61,12 +61,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                        Class boundaryRandomSet Declaration
+                        Class boundaryRandom Declaration
 \*---------------------------------------------------------------------------*/
 
-class boundaryRandomSet
+class boundaryRandom
 :
     public sampledSet
 {
@@ -104,7 +106,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        boundaryRandomSet
+        boundaryRandom
         (
             const word& name,
             const polyMesh& mesh,
@@ -114,12 +116,13 @@ public:
 
 
     //- Destructor
-    virtual ~boundaryRandomSet();
+    virtual ~boundaryRandom();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/boxUniform/boxUniformSet.C b/src/sampling/sampledSet/boxUniform/boxUniform.C
similarity index 91%
rename from src/sampling/sampledSet/boxUniform/boxUniformSet.C
rename to src/sampling/sampledSet/boxUniform/boxUniform.C
index 2acd75c74..e4b2deda2 100644
--- a/src/sampling/sampledSet/boxUniform/boxUniformSet.C
+++ b/src/sampling/sampledSet/boxUniform/boxUniform.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "boxUniformSet.H"
+#include "boxUniform.H"
 #include "sampledSet.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
@@ -36,14 +36,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(boxUniformSet, 0);
-    addToRunTimeSelectionTable(sampledSet, boxUniformSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(boxUniform, 0);
+    addToRunTimeSelectionTable(sampledSet, boxUniform, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::boxUniformSet::calcSamples
+void Foam::sampledSets::boxUniform::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -81,7 +84,7 @@ void Foam::boxUniformSet::calcSamples
 }
 
 
-void Foam::boxUniformSet::genSamples()
+void Foam::sampledSets::boxUniform::genSamples()
 {
     // Storage for sample points
     DynamicList<point> samplingPts;
@@ -118,7 +121,7 @@ void Foam::boxUniformSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::boxUniformSet::boxUniformSet
+Foam::sampledSets::boxUniform::boxUniform
 (
     const word& name,
     const polyMesh& mesh,
@@ -141,7 +144,7 @@ Foam::boxUniformSet::boxUniformSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::boxUniformSet::~boxUniformSet()
+Foam::sampledSets::boxUniform::~boxUniform()
 {}
 
 
diff --git a/src/sampling/sampledSet/boxUniform/boxUniformSet.H b/src/sampling/sampledSet/boxUniform/boxUniform.H
similarity index 92%
rename from src/sampling/sampledSet/boxUniform/boxUniformSet.H
rename to src/sampling/sampledSet/boxUniform/boxUniform.H
index 6e89f2461..b9784dae7 100644
--- a/src/sampling/sampledSet/boxUniform/boxUniformSet.H
+++ b/src/sampling/sampledSet/boxUniform/boxUniform.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::boxUniformSet
+    Foam::sampledSets::boxUniform
 
 Description
     Uniform 3D-grid of samples
@@ -46,12 +46,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    boxUniformSet.C
+    boxUniform.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef boxUniformSet_H
-#define boxUniformSet_H
+#ifndef boxUniform_H
+#define boxUniform_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -67,11 +67,14 @@ namespace Foam
 class passiveParticle;
 template<class Type> class particle;
 
+namespace sampledSets
+{
+
 /*---------------------------------------------------------------------------*\
-                           Class boxUniformSet Declaration
+                           Class boxUniform Declaration
 \*---------------------------------------------------------------------------*/
 
-class boxUniformSet
+class boxUniform
 :
     public sampledSet
 {
@@ -109,7 +112,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        boxUniformSet
+        boxUniform
         (
             const word& name,
             const polyMesh& mesh,
@@ -119,12 +122,13 @@ public:
 
 
     //- Destructor
-    virtual ~boxUniformSet();
+    virtual ~boxUniform();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/circleRandom/circleRandomSet.C b/src/sampling/sampledSet/circleRandom/circleRandom.C
similarity index 91%
rename from src/sampling/sampledSet/circleRandom/circleRandomSet.C
rename to src/sampling/sampledSet/circleRandom/circleRandom.C
index 46376b6b2..4ddf543aa 100644
--- a/src/sampling/sampledSet/circleRandom/circleRandomSet.C
+++ b/src/sampling/sampledSet/circleRandom/circleRandom.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "circleRandomSet.H"
+#include "circleRandom.H"
 #include "sampledSet.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
@@ -37,14 +37,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(circleRandomSet, 0);
-    addToRunTimeSelectionTable(sampledSet, circleRandomSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(circleRandom, 0);
+    addToRunTimeSelectionTable(sampledSet, circleRandom, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::circleRandomSet::calcSamples
+void Foam::sampledSets::circleRandom::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -82,7 +85,7 @@ void Foam::circleRandomSet::calcSamples
 }
 
 
-void Foam::circleRandomSet::genSamples()
+void Foam::sampledSets::circleRandom::genSamples()
 {
     // Storage for sample points
     DynamicList<point> samplingPts;
@@ -119,7 +122,7 @@ void Foam::circleRandomSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::circleRandomSet::circleRandomSet
+Foam::sampledSets::circleRandom::circleRandom
 (
     const word& name,
     const polyMesh& mesh,
@@ -144,7 +147,7 @@ Foam::circleRandomSet::circleRandomSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::circleRandomSet::~circleRandomSet()
+Foam::sampledSets::circleRandom::~circleRandom()
 {}
 
 
diff --git a/src/sampling/sampledSet/circleRandom/circleRandomSet.H b/src/sampling/sampledSet/circleRandom/circleRandom.H
similarity index 92%
rename from src/sampling/sampledSet/circleRandom/circleRandomSet.H
rename to src/sampling/sampledSet/circleRandom/circleRandom.H
index 0baba8b90..86540c28f 100644
--- a/src/sampling/sampledSet/circleRandom/circleRandomSet.H
+++ b/src/sampling/sampledSet/circleRandom/circleRandom.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::circleRandomSet
+    Foam::sampledSets::circleRandom
 
 Description
     Random samples within a circle
@@ -50,12 +50,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    circleRandomSet.C
+    circleRandom.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef circleRandomSet_H
-#define circleRandomSet_H
+#ifndef circleRandom_H
+#define circleRandom_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -64,12 +64,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                          Class circleRandomSet Declaration
+                          Class circleRandom Declaration
 \*---------------------------------------------------------------------------*/
 
-class circleRandomSet
+class circleRandom
 :
     public sampledSet
 {
@@ -113,7 +115,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        circleRandomSet
+        circleRandom
         (
             const word& name,
             const polyMesh& mesh,
@@ -124,12 +126,13 @@ public:
 
     // Destructor
 
-        virtual ~circleRandomSet();
+        virtual ~circleRandom();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/lineCell/lineCellSet.C b/src/sampling/sampledSet/lineCell/lineCell.C
similarity index 93%
rename from src/sampling/sampledSet/lineCell/lineCellSet.C
rename to src/sampling/sampledSet/lineCell/lineCell.C
index 80c473411..0295e1046 100644
--- a/src/sampling/sampledSet/lineCell/lineCellSet.C
+++ b/src/sampling/sampledSet/lineCell/lineCell.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "lineCellSet.H"
+#include "lineCell.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
@@ -33,14 +33,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(lineCellSet, 0);
-    addToRunTimeSelectionTable(sampledSet, lineCellSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(lineCell, 0);
+    addToRunTimeSelectionTable(sampledSet, lineCell, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-void Foam::lineCellSet::calcMidPointSample
+void Foam::sampledSets::lineCell::calcMidPointSample
 (
     const polyMesh& mesh,
     const point& prevPt,
@@ -100,7 +103,7 @@ void Foam::lineCellSet::calcMidPointSample
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::lineCellSet::calcSamples
+void Foam::sampledSets::lineCell::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -115,7 +118,7 @@ void Foam::lineCellSet::calcSamples
     DynamicList<label> faceFaces;
     DynamicList<label> faceSegments;
     DynamicList<scalar> faceCurveDist;
-    lineFaceSet::calcSamples
+    lineFace::calcSamples
     (
         mesh(),
         searchEngine(),
@@ -151,7 +154,7 @@ void Foam::lineCellSet::calcSamples
 }
 
 
-void Foam::lineCellSet::genSamples()
+void Foam::sampledSets::lineCell::genSamples()
 {
     DynamicList<point> samplingPts;
     DynamicList<label> samplingCells;
@@ -187,7 +190,7 @@ void Foam::lineCellSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::lineCellSet::lineCellSet
+Foam::sampledSets::lineCell::lineCell
 (
     const word& name,
     const polyMesh& mesh,
@@ -210,7 +213,7 @@ Foam::lineCellSet::lineCellSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::lineCellSet::~lineCellSet()
+Foam::sampledSets::lineCell::~lineCell()
 {}
 
 
diff --git a/src/sampling/sampledSet/lineCell/lineCellSet.H b/src/sampling/sampledSet/lineCell/lineCell.H
similarity index 93%
rename from src/sampling/sampledSet/lineCell/lineCellSet.H
rename to src/sampling/sampledSet/lineCell/lineCell.H
index b21255d9e..51793542d 100644
--- a/src/sampling/sampledSet/lineCell/lineCellSet.H
+++ b/src/sampling/sampledSet/lineCell/lineCell.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::lineCellSet
+    Foam::sampledSets::lineCell
 
 Description
     Cell-samples along a line at the mid-points in-between face-intersections
@@ -46,25 +46,27 @@ Usage
     \endverbatim
 
 SourceFiles
-    lineCellSet.C
+    lineCell.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef lineCellSet_H
-#define lineCellSet_H
+#ifndef lineCell_H
+#define lineCell_H
 
-#include "lineFaceSet.H"
+#include "lineFace.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                         Class lineCellSet Declaration
+                         Class lineCell Declaration
 \*---------------------------------------------------------------------------*/
 
-class lineCellSet
+class lineCell
 :
     public sampledSet
 {
@@ -123,7 +125,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        lineCellSet
+        lineCell
         (
             const word& name,
             const polyMesh& mesh,
@@ -133,12 +135,13 @@ public:
 
 
     //- Destructor
-    virtual ~lineCellSet();
+    virtual ~lineCell();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/lineCellFace/lineCellFaceSet.C b/src/sampling/sampledSet/lineCellFace/lineCellFace.C
similarity index 91%
rename from src/sampling/sampledSet/lineCellFace/lineCellFaceSet.C
rename to src/sampling/sampledSet/lineCellFace/lineCellFace.C
index 5b07efcf7..04c07a631 100644
--- a/src/sampling/sampledSet/lineCellFace/lineCellFaceSet.C
+++ b/src/sampling/sampledSet/lineCellFace/lineCellFace.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "lineCellFaceSet.H"
+#include "lineCellFace.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
@@ -33,14 +33,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(lineCellFaceSet, 0);
-    addToRunTimeSelectionTable(sampledSet, lineCellFaceSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(lineCellFace, 0);
+    addToRunTimeSelectionTable(sampledSet, lineCellFace, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::lineCellFaceSet::calcSamples
+void Foam::sampledSets::lineCellFace::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -55,7 +58,7 @@ void Foam::lineCellFaceSet::calcSamples
     DynamicList<label> faceFaces;
     DynamicList<label> faceSegments;
     DynamicList<scalar> faceCurveDist;
-    lineFaceSet::calcSamples
+    lineFace::calcSamples
     (
         mesh(),
         searchEngine(),
@@ -84,7 +87,7 @@ void Foam::lineCellFaceSet::calcSamples
 
     for (label facei = 1; facei < facePts.size(); ++ facei)
     {
-        lineCellSet::calcMidPointSample
+        lineCell::calcMidPointSample
         (
             mesh(),
             samplingPts.last(),
@@ -110,7 +113,7 @@ void Foam::lineCellFaceSet::calcSamples
 }
 
 
-void Foam::lineCellFaceSet::genSamples()
+void Foam::sampledSets::lineCellFace::genSamples()
 {
     DynamicList<point> samplingPts;
     DynamicList<label> samplingCells;
@@ -146,7 +149,7 @@ void Foam::lineCellFaceSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::lineCellFaceSet::lineCellFaceSet
+Foam::sampledSets::lineCellFace::lineCellFace
 (
     const word& name,
     const polyMesh& mesh,
@@ -167,7 +170,7 @@ Foam::lineCellFaceSet::lineCellFaceSet
 }
 
 
-Foam::lineCellFaceSet::lineCellFaceSet
+Foam::sampledSets::lineCellFace::lineCellFace
 (
     const word& name,
     const polyMesh& mesh,
@@ -192,7 +195,7 @@ Foam::lineCellFaceSet::lineCellFaceSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::lineCellFaceSet::~lineCellFaceSet()
+Foam::sampledSets::lineCellFace::~lineCellFace()
 {}
 
 
diff --git a/src/sampling/sampledSet/lineCellFace/lineCellFaceSet.H b/src/sampling/sampledSet/lineCellFace/lineCellFace.H
similarity index 91%
rename from src/sampling/sampledSet/lineCellFace/lineCellFaceSet.H
rename to src/sampling/sampledSet/lineCellFace/lineCellFace.H
index c5cfd4741..6cea0e47e 100644
--- a/src/sampling/sampledSet/lineCellFace/lineCellFaceSet.H
+++ b/src/sampling/sampledSet/lineCellFace/lineCellFace.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::lineCellFaceSet
+    Foam::sampledSets::lineCellFace
 
 Description
     Face-intersections along a line, plus cell-samples at the mid-points
@@ -47,25 +47,27 @@ Usage
     \endverbatim
 
 SourceFiles
-    lineCellFaceSet.C
+    lineCellFace.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef lineCellFaceSet_H
-#define lineCellFaceSet_H
+#ifndef lineCellFace_H
+#define lineCellFace_H
 
-#include "lineCellSet.H"
+#include "lineCell.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                         Class lineCellFaceSet Declaration
+                         Class lineCellFace Declaration
 \*---------------------------------------------------------------------------*/
 
-class lineCellFaceSet
+class lineCellFace
 :
     public sampledSet
 {
@@ -103,7 +105,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        lineCellFaceSet
+        lineCellFace
         (
             const word& name,
             const polyMesh& mesh,
@@ -112,7 +114,7 @@ public:
         );
 
         //- Construct from components
-        lineCellFaceSet
+        lineCellFace
         (
             const word& name,
             const polyMesh& mesh,
@@ -124,12 +126,13 @@ public:
 
 
     //- Destructor
-    virtual ~lineCellFaceSet();
+    virtual ~lineCellFace();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/lineFace/lineFaceSet.C b/src/sampling/sampledSet/lineFace/lineFace.C
similarity index 94%
rename from src/sampling/sampledSet/lineFace/lineFaceSet.C
rename to src/sampling/sampledSet/lineFace/lineFace.C
index 6684daeb0..1df997746 100644
--- a/src/sampling/sampledSet/lineFace/lineFaceSet.C
+++ b/src/sampling/sampledSet/lineFace/lineFace.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "lineFaceSet.H"
+#include "lineFace.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
@@ -33,14 +33,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(lineFaceSet, 0);
-    addToRunTimeSelectionTable(sampledSet, lineFaceSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(lineFace, 0);
+    addToRunTimeSelectionTable(sampledSet, lineFace, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-void Foam::lineFaceSet::calcSamples
+void Foam::sampledSets::lineFace::calcSamples
 (
     const polyMesh& mesh,
     const meshSearch& searchEngine,
@@ -161,7 +164,7 @@ void Foam::lineFaceSet::calcSamples
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::lineFaceSet::calcSamples
+void Foam::sampledSets::lineFace::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -185,7 +188,7 @@ void Foam::lineFaceSet::calcSamples
 }
 
 
-void Foam::lineFaceSet::genSamples()
+void Foam::sampledSets::lineFace::genSamples()
 {
     DynamicList<point> samplingPts;
     DynamicList<label> samplingCells;
@@ -221,7 +224,7 @@ void Foam::lineFaceSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::lineFaceSet::lineFaceSet
+Foam::sampledSets::lineFace::lineFace
 (
     const word& name,
     const polyMesh& mesh,
@@ -244,7 +247,7 @@ Foam::lineFaceSet::lineFaceSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::lineFaceSet::~lineFaceSet()
+Foam::sampledSets::lineFace::~lineFace()
 {}
 
 
diff --git a/src/sampling/sampledSet/lineFace/lineFaceSet.H b/src/sampling/sampledSet/lineFace/lineFace.H
similarity index 93%
rename from src/sampling/sampledSet/lineFace/lineFaceSet.H
rename to src/sampling/sampledSet/lineFace/lineFace.H
index d7fde8816..349812e24 100644
--- a/src/sampling/sampledSet/lineFace/lineFaceSet.H
+++ b/src/sampling/sampledSet/lineFace/lineFace.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::lineFaceSet
+    Foam::sampledSets::lineFace
 
 Description
     Face-intersections along a line
@@ -46,12 +46,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    lineFaceSet.C
+    lineFace.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef lineFaceSet_H
-#define lineFaceSet_H
+#ifndef lineFace_H
+#define lineFace_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -61,12 +61,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                         Class lineFaceSet Declaration
+                         Class lineFace Declaration
 \*---------------------------------------------------------------------------*/
 
-class lineFaceSet
+class lineFace
 :
     public sampledSet
 {
@@ -121,7 +123,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        lineFaceSet
+        lineFace
         (
             const word& name,
             const polyMesh& mesh,
@@ -131,12 +133,13 @@ public:
 
 
     //- Destructor
-    virtual ~lineFaceSet();
+    virtual ~lineFace();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/lineUniform/lineUniformSet.C b/src/sampling/sampledSet/lineUniform/lineUniform.C
similarity index 92%
rename from src/sampling/sampledSet/lineUniform/lineUniformSet.C
rename to src/sampling/sampledSet/lineUniform/lineUniform.C
index f34a51839..7d1aef8a0 100644
--- a/src/sampling/sampledSet/lineUniform/lineUniformSet.C
+++ b/src/sampling/sampledSet/lineUniform/lineUniform.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "lineUniformSet.H"
+#include "lineUniform.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
@@ -33,14 +33,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(lineUniformSet, 0);
-    addToRunTimeSelectionTable(sampledSet, lineUniformSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(lineUniform, 0);
+    addToRunTimeSelectionTable(sampledSet, lineUniform, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::lineUniformSet::calcSamples
+void Foam::sampledSets::lineUniform::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -91,7 +94,7 @@ void Foam::lineUniformSet::calcSamples
 }
 
 
-void Foam::lineUniformSet::genSamples()
+void Foam::sampledSets::lineUniform::genSamples()
 {
     DynamicList<point> samplingPts;
     DynamicList<label> samplingCells;
@@ -127,7 +130,7 @@ void Foam::lineUniformSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::lineUniformSet::lineUniformSet
+Foam::sampledSets::lineUniform::lineUniform
 (
     const word& name,
     const polyMesh& mesh,
@@ -151,7 +154,7 @@ Foam::lineUniformSet::lineUniformSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::lineUniformSet::~lineUniformSet()
+Foam::sampledSets::lineUniform::~lineUniform()
 {}
 
 
diff --git a/src/sampling/sampledSet/lineUniform/lineUniformSet.H b/src/sampling/sampledSet/lineUniform/lineUniform.H
similarity index 92%
rename from src/sampling/sampledSet/lineUniform/lineUniformSet.H
rename to src/sampling/sampledSet/lineUniform/lineUniform.H
index 69ed798ef..948b28083 100644
--- a/src/sampling/sampledSet/lineUniform/lineUniformSet.H
+++ b/src/sampling/sampledSet/lineUniform/lineUniform.H
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------* \
+/*---------------------------------------------------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::lineUniformSet
+    Foam::sampledSets::lineUniform
 
 Description
     Uniform samples along a line
@@ -48,12 +48,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    lineUniformSet.C
+    lineUniform.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef lineUniformSet_H
-#define lineUniformSet_H
+#ifndef lineUniform_H
+#define lineUniform_H
 
 #include "passiveParticleCloud.H"
 #include "sampledSet.H"
@@ -63,12 +63,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                           Class lineUniformSet Declaration
+                           Class lineUniform Declaration
 \*---------------------------------------------------------------------------*/
 
-class lineUniformSet
+class lineUniform
 :
     public sampledSet
 {
@@ -110,7 +112,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        lineUniformSet
+        lineUniform
         (
             const word& name,
             const polyMesh& mesh,
@@ -120,12 +122,13 @@ public:
 
 
     //- Destructor
-    virtual ~lineUniformSet();
+    virtual ~lineUniform();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/points/pointsSet.C b/src/sampling/sampledSet/points/points.C
similarity index 92%
rename from src/sampling/sampledSet/points/pointsSet.C
rename to src/sampling/sampledSet/points/points.C
index 4cb9ca010..5bb8f3bed 100644
--- a/src/sampling/sampledSet/points/pointsSet.C
+++ b/src/sampling/sampledSet/points/points.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------* \
+/*---------------------------------------------------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "pointsSet.H"
+#include "points.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
@@ -33,14 +33,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(pointsSet, 0);
-    addToRunTimeSelectionTable(sampledSet, pointsSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(points, 0);
+    addToRunTimeSelectionTable(sampledSet, points, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::pointsSet::calcSamplesUnordered
+void Foam::sampledSets::points::calcSamplesUnordered
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -65,7 +68,7 @@ void Foam::pointsSet::calcSamplesUnordered
     }
 }
 
-void Foam::pointsSet::calcSamplesOrdered
+void Foam::sampledSets::points::calcSamplesOrdered
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -120,7 +123,7 @@ void Foam::pointsSet::calcSamplesOrdered
 }
 
 
-void Foam::pointsSet::genSamples()
+void Foam::sampledSets::points::genSamples()
 {
     DynamicList<point> samplingPts;
     DynamicList<label> samplingCells;
@@ -170,7 +173,7 @@ void Foam::pointsSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::pointsSet::pointsSet
+Foam::sampledSets::points::points
 (
     const word& name,
     const polyMesh& mesh,
@@ -193,7 +196,7 @@ Foam::pointsSet::pointsSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::pointsSet::~pointsSet()
+Foam::sampledSets::points::~points()
 {}
 
 
diff --git a/src/sampling/sampledSet/points/pointsSet.H b/src/sampling/sampledSet/points/points.H
similarity index 94%
rename from src/sampling/sampledSet/points/pointsSet.H
rename to src/sampling/sampledSet/points/points.H
index e9c2bce0b..498a8abe9 100644
--- a/src/sampling/sampledSet/points/pointsSet.H
+++ b/src/sampling/sampledSet/points/points.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::pointsSet
+    Foam::sampledSets::points
 
 Description
     Specified point samples. Optionally ordered into a continuous path.
@@ -60,12 +60,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    pointsSet.C
+    points.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef pointsSet_H
-#define pointsSet_H
+#ifndef points_H
+#define points_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -75,12 +75,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                        Class pointsSet Declaration
+                        Class points Declaration
 \*---------------------------------------------------------------------------*/
 
-class pointsSet
+class points
 :
     public sampledSet
 {
@@ -128,7 +130,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        pointsSet
+        points
         (
             const word& name,
             const polyMesh& mesh,
@@ -138,12 +140,13 @@ public:
 
 
     //- Destructor
-    virtual ~pointsSet();
+    virtual ~points();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 58b472865..e6755f8c7 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -27,10 +27,10 @@ License
 #include "polyMesh.H"
 #include "meshSearch.H"
 #include "writer.H"
-#include "lineCellSet.H"
-#include "lineCellFaceSet.H"
-#include "lineFaceSet.H"
-#include "lineUniformSet.H"
+#include "lineCell.H"
+#include "lineCellFace.H"
+#include "lineFace.H"
+#include "lineUniform.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -144,10 +144,14 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
 
     const HashTable<word> oldToNewType =
     {
-        Tuple2<word, word>("midPoint", lineCellSet::typeName),
-        Tuple2<word, word>("midPointAndFace", lineCellFaceSet::typeName),
-        Tuple2<word, word>("face", lineFaceSet::typeName),
-        Tuple2<word, word>("uniform", lineUniformSet::typeName)
+        Tuple2<word, word>("midPoint", sampledSets::lineCell::typeName),
+        Tuple2<word, word>
+        (
+            "midPointAndFace",
+            sampledSets::lineCellFace::typeName
+        ),
+        Tuple2<word, word>("face", sampledSets::lineFace::typeName),
+        Tuple2<word, word>("uniform", sampledSets::lineUniform::typeName)
     };
 
     if (oldToNewType.found(sampleType))
diff --git a/src/sampling/sampledSet/sphereRandom/sphereRandomSet.C b/src/sampling/sampledSet/sphereRandom/sphereRandom.C
similarity index 91%
rename from src/sampling/sampledSet/sphereRandom/sphereRandomSet.C
rename to src/sampling/sampledSet/sphereRandom/sphereRandom.C
index ce5696b1c..5c9927fca 100644
--- a/src/sampling/sampledSet/sphereRandom/sphereRandomSet.C
+++ b/src/sampling/sampledSet/sphereRandom/sphereRandom.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "sphereRandomSet.H"
+#include "sphereRandom.H"
 #include "sampledSet.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
@@ -37,14 +37,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(sphereRandomSet, 0);
-    addToRunTimeSelectionTable(sampledSet, sphereRandomSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(sphereRandom, 0);
+    addToRunTimeSelectionTable(sampledSet, sphereRandom, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::sphereRandomSet::calcSamples
+void Foam::sampledSets::sphereRandom::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -81,7 +84,7 @@ void Foam::sphereRandomSet::calcSamples
 }
 
 
-void Foam::sphereRandomSet::genSamples()
+void Foam::sampledSets::sphereRandom::genSamples()
 {
     // Storage for sample points
     DynamicList<point> samplingPts;
@@ -118,7 +121,7 @@ void Foam::sphereRandomSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::sphereRandomSet::sphereRandomSet
+Foam::sampledSets::sphereRandom::sphereRandom
 (
     const word& name,
     const polyMesh& mesh,
@@ -142,7 +145,7 @@ Foam::sphereRandomSet::sphereRandomSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::sphereRandomSet::~sphereRandomSet()
+Foam::sampledSets::sphereRandom::~sphereRandom()
 {}
 
 
diff --git a/src/sampling/sampledSet/sphereRandom/sphereRandomSet.H b/src/sampling/sampledSet/sphereRandom/sphereRandom.H
similarity index 92%
rename from src/sampling/sampledSet/sphereRandom/sphereRandomSet.H
rename to src/sampling/sampledSet/sphereRandom/sphereRandom.H
index 820f660cd..f6b2f1edb 100644
--- a/src/sampling/sampledSet/sphereRandom/sphereRandomSet.H
+++ b/src/sampling/sampledSet/sphereRandom/sphereRandom.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::sphereRandomSet
+    Foam::sampledSets::sphereRandom
 
 Description
     Random samples within a sphere
@@ -48,12 +48,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    sphereRandomSet.C
+    sphereRandom.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef sphereRandomSet_H
-#define sphereRandomSet_H
+#ifndef sphereRandom_H
+#define sphereRandom_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -62,12 +62,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                          Class sphereRandomSet Declaration
+                          Class sphereRandom Declaration
 \*---------------------------------------------------------------------------*/
 
-class sphereRandomSet
+class sphereRandom
 :
     public sampledSet
 {
@@ -108,7 +110,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        sphereRandomSet
+        sphereRandom
         (
             const word& name,
             const polyMesh& mesh,
@@ -119,12 +121,13 @@ public:
 
     // Destructor
 
-        virtual ~sphereRandomSet();
+        virtual ~sphereRandom();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/triSurfaceMesh/triSurfaceMeshSet.C b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
similarity index 89%
rename from src/sampling/sampledSet/triSurfaceMesh/triSurfaceMeshSet.C
rename to src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
index 5881c161e..5c2e5f760 100644
--- a/src/sampling/sampledSet/triSurfaceMesh/triSurfaceMeshSet.C
+++ b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "triSurfaceMeshSet.H"
+#include "triSurfaceMeshSampledSet.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
@@ -35,14 +35,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(triSurfaceMeshSet, 0);
-    addToRunTimeSelectionTable(sampledSet, triSurfaceMeshSet, word);
+namespace sampledSets
+{
+    defineTypeNameAndDebug(triSurfaceMeshSampledSet, 0);
+    addToRunTimeSelectionTable(sampledSet, triSurfaceMeshSampledSet, word);
+}
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::triSurfaceMeshSet::calcSamples
+void Foam::sampledSets::triSurfaceMeshSampledSet::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -68,7 +71,7 @@ void Foam::triSurfaceMeshSet::calcSamples
 }
 
 
-void Foam::triSurfaceMeshSet::genSamples()
+void Foam::sampledSets::triSurfaceMeshSampledSet::genSamples()
 {
     // Storage for sample points
     DynamicList<point> samplingPts;
@@ -105,7 +108,7 @@ void Foam::triSurfaceMeshSet::genSamples()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::triSurfaceMeshSet::triSurfaceMeshSet
+Foam::sampledSets::triSurfaceMeshSampledSet::triSurfaceMeshSampledSet
 (
     const word& name,
     const polyMesh& mesh,
@@ -145,7 +148,7 @@ Foam::triSurfaceMeshSet::triSurfaceMeshSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::triSurfaceMeshSet::~triSurfaceMeshSet()
+Foam::sampledSets::triSurfaceMeshSampledSet::~triSurfaceMeshSampledSet()
 {}
 
 
diff --git a/src/sampling/sampledSet/triSurfaceMesh/triSurfaceMeshSet.H b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H
similarity index 89%
rename from src/sampling/sampledSet/triSurfaceMesh/triSurfaceMeshSet.H
rename to src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H
index 0d6fbe536..556653a55 100644
--- a/src/sampling/sampledSet/triSurfaceMesh/triSurfaceMeshSet.H
+++ b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::triSurfaceMeshSet
+    Foam::sampledSets::triSurfaceMeshSampledSet
 
 Description
     Samples from all the points of a triSurfaceMesh. Surface files are read
@@ -45,12 +45,12 @@ Usage
     \endverbatim
 
 SourceFiles
-    triSurfaceMeshSet.C
+    triSurfaceMeshSampledSet.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef triSurfaceMeshSet_H
-#define triSurfaceMeshSet_H
+#ifndef triSurfaceMeshSampledSet_H
+#define triSurfaceMeshSampledSet_H
 
 #include "sampledSet.H"
 
@@ -58,12 +58,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace sampledSets
+{
 
 /*---------------------------------------------------------------------------*\
-                           Class triSurfaceMeshSet Declaration
+                   Class triSurfaceMeshSampledSet Declaration
 \*---------------------------------------------------------------------------*/
 
-class triSurfaceMeshSet
+class triSurfaceMeshSampledSet
 :
     public sampledSet
 {
@@ -101,7 +103,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        triSurfaceMeshSet
+        triSurfaceMeshSampledSet
         (
             const word& name,
             const polyMesh& mesh,
@@ -111,12 +113,13 @@ public:
 
 
     //- Destructor
-    virtual ~triSurfaceMeshSet();
+    virtual ~triSurfaceMeshSampledSet();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace sampledSets
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sample b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sample
deleted file mode 100644
index 8a2113c79..000000000
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sample
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      sample;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-type sets;
-libs            ("libsampling.so");
-
-interpolationScheme cellPointFace;
-
-writeFormat     raw;
-
-sampleSets
-(
-    face
-    {
-        name    cone25;
-        axis    x;
-        start   (0 0 0);
-        end     (0.09208087 0.042939 0);
-        nPoints 92;
-    }
-    face
-    {
-        name    cone55;
-        axis    x;
-        start   (0.09208087 0.042939 0);
-        end     (0.153683 0.13092 0);
-        nPoints 61;
-    }
-    face
-    {
-        name    base;
-        axis    x;
-        start   (0.153683 0.13092 0);
-        end     (0.193675 0.13092 0);
-        nPoints 40;
-    }
-);
-
-fields          ( p wallHeatTransRate );
-
-
-// ************************************************************************* //