diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index c69f609c39..e892508a92 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -60,7 +60,7 @@ fields
 //      midPoint            one point per cell, inbetween two face intersections
 //      midPointAndFace     combination of face and midPoint
 //
-//      curve               specified points, not nessecary on line, uses
+//      polyLine            specified points, not nessecary on line, uses
 //                          tracking
 //      cloud               specified points, uses findCell
 //      triSurfaceMeshPointSet  points of triSurface
@@ -75,7 +75,7 @@ fields
 // type specific:
 //      uniform, face, midPoint, midPointAndFace : start and end coordinate
 //      uniform: extra number of sampling points
-//      curve, cloud: list of coordinates
+//      polyLine, cloud: list of coordinates
 sets
 (
     lineX1
diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index 2c7920d29e..c385e9aa93 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -4,7 +4,7 @@ probes/probesFunctionObject/probesFunctionObject.C
 
 sampledSet/cloud/cloudSet.C
 sampledSet/coordSet/coordSet.C
-sampledSet/curve/curveSet.C
+sampledSet/polyLine/polyLineSet.C
 sampledSet/face/faceOnlySet.C
 sampledSet/midPoint/midPointSet.C
 sampledSet/midPointAndFace/midPointAndFaceSet.C
diff --git a/src/sampling/sampledSet/curve/curveSet.C b/src/sampling/sampledSet/polyLine/polyLineSet.C
similarity index 90%
rename from src/sampling/sampledSet/curve/curveSet.C
rename to src/sampling/sampledSet/polyLine/polyLineSet.C
index d5be7c09a7..25343123b1 100644
--- a/src/sampling/sampledSet/curve/curveSet.C
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "curveSet.H"
+#include "polyLineSet.H"
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
@@ -38,22 +38,22 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(curveSet, 0);
-    addToRunTimeSelectionTable(sampledSet, curveSet, word);
+    defineTypeNameAndDebug(polyLineSet, 0);
+    addToRunTimeSelectionTable(sampledSet, polyLineSet, word);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Sample till hits boundary.
-bool Foam::curveSet::trackToBoundary
+bool Foam::polyLineSet::trackToBoundary
 (
     Particle<passiveParticle>& singleParticle,
     label& sampleI,
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
     DynamicList<label>& samplingFaces,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<scalar>& samplingPolyLineDist
 ) const
 {
     // Alias
@@ -97,7 +97,7 @@ bool Foam::curveSet::trackToBoundary
                 samplingFaces.append(facei);
 
                 // trackPt is at sampleI+1
-                samplingCurveDist.append(1.0*(sampleI+1));
+                samplingPolyLineDist.append(1.0*(sampleI+1));
             }
             return true;
         }
@@ -111,7 +111,7 @@ bool Foam::curveSet::trackToBoundary
         scalar dist =
             mag(trackPt - sampleCoords_[sampleI])
           / mag(sampleCoords_[sampleI+1] - sampleCoords_[sampleI]);
-        samplingCurveDist.append(sampleI + dist);
+        samplingPolyLineDist.append(sampleI + dist);
 
         // go to next samplePt
         sampleI++;
@@ -127,19 +127,19 @@ bool Foam::curveSet::trackToBoundary
 }
 
 
-void Foam::curveSet::calcSamples
+void Foam::polyLineSet::calcSamples
 (
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
     DynamicList<label>& samplingFaces,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<scalar>& samplingPolyLineDist
 ) const
 {
     // Check sampling points
     if (sampleCoords_.size() < 2)
     {
-        FatalErrorIn("curveSet::calcSamples()")
+        FatalErrorIn("polyLineSet::calcSamples()")
             << "Incorrect sample specification. Too few points:"
             << sampleCoords_ << exit(FatalError);
     }
@@ -148,7 +148,7 @@ void Foam::curveSet::calcSamples
     {
         if (mag(sampleCoords_[sampleI] - oldPoint) < SMALL)
         {
-            FatalErrorIn("curveSet::calcSamples()")
+            FatalErrorIn("polyLineSet::calcSamples()")
                 << "Incorrect sample specification."
                 << " Point " << sampleCoords_[sampleI-1]
                 << " at position " << sampleI-1
@@ -227,12 +227,12 @@ void Foam::curveSet::calcSamples
                 samplingCells.append(trackCellI);
                 samplingFaces.append(trackFaceI);
 
-                // Convert sampling position to unique curve parameter. Get
+                // Convert sampling position to unique poly line parameter. Get
                 // fraction of distance between sampleI and sampleI+1.
                 scalar dist =
                     mag(trackPt - sampleCoords_[sampleI])
                   / mag(sampleCoords_[sampleI+1] - sampleCoords_[sampleI]);
-                samplingCurveDist.append(sampleI + dist);
+                samplingPolyLineDist.append(sampleI + dist);
 
                 lastSample = trackPt;
             }
@@ -273,7 +273,7 @@ void Foam::curveSet::calcSamples
             samplingPts,
             samplingCells,
             samplingFaces,
-            samplingCurveDist
+            samplingPolyLineDist
         );
 
         // fill sampleSegments
@@ -310,14 +310,14 @@ void Foam::curveSet::calcSamples
 }
 
 
-void Foam::curveSet::genSamples()
+void Foam::polyLineSet::genSamples()
 {
     // Storage for sample points
     DynamicList<point> samplingPts;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
     DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
+    DynamicList<scalar> samplingPolyLineDist;
 
     calcSamples
     (
@@ -325,14 +325,14 @@ void Foam::curveSet::genSamples()
         samplingCells,
         samplingFaces,
         samplingSegments,
-        samplingCurveDist
+        samplingPolyLineDist
     );
 
     samplingPts.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
     samplingSegments.shrink();
-    samplingCurveDist.shrink();
+    samplingPolyLineDist.shrink();
 
     setSamples
     (
@@ -340,14 +340,14 @@ void Foam::curveSet::genSamples()
         samplingCells,
         samplingFaces,
         samplingSegments,
-        samplingCurveDist
+        samplingPolyLineDist
     );
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::curveSet::curveSet
+Foam::polyLineSet::polyLineSet
 (
     const word& name,
     const polyMesh& mesh,
@@ -368,7 +368,7 @@ Foam::curveSet::curveSet
 }
 
 
-Foam::curveSet::curveSet
+Foam::polyLineSet::polyLineSet
 (
     const word& name,
     const polyMesh& mesh,
@@ -390,13 +390,13 @@ Foam::curveSet::curveSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::curveSet::~curveSet()
+Foam::polyLineSet::~polyLineSet()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::point Foam::curveSet::getRefPoint(const List<point>& pts) const
+Foam::point Foam::polyLineSet::getRefPoint(const List<point>& pts) const
 {
     if (pts.size())
     {
diff --git a/src/sampling/sampledSet/curve/curveSet.H b/src/sampling/sampledSet/polyLine/polyLineSet.H
similarity index 87%
rename from src/sampling/sampledSet/curve/curveSet.H
rename to src/sampling/sampledSet/polyLine/polyLineSet.H
index c267ef301e..75ad1bf0ac 100644
--- a/src/sampling/sampledSet/curve/curveSet.H
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,17 +22,18 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::curveSet
+    Foam::polyLineSet
 
 Description
+    Sample along poly line defined by a list of points (knots)
 
 SourceFiles
-    curveSet.C
+    polyLineSet.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef curveSet_H
-#define curveSet_H
+#ifndef polyLineSet_H
+#define polyLineSet_H
 
 #include "sampledSet.H"
 #include "DynamicList.H"
@@ -47,10 +48,10 @@ class passiveParticle;
 template<class Type> class Particle;
 
 /*---------------------------------------------------------------------------*\
-                           Class curveSet Declaration
+                        Class polyLineSet Declaration
 \*---------------------------------------------------------------------------*/
 
-class curveSet
+class polyLineSet
 :
     public sampledSet
 {
@@ -72,7 +73,7 @@ class curveSet
             DynamicList<point>& samplingPts,
             DynamicList<label>& samplingCells,
             DynamicList<label>& samplingFaces,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<scalar>& samplingPolyLineDist
         ) const;
 
         //- Samples all point in sampleCoords_
@@ -83,7 +84,7 @@ class curveSet
             DynamicList<label>& samplingCells,
             DynamicList<label>& samplingFaces,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<scalar>& samplingPolyLineDist
         ) const;
 
         //- Uses calcSamples to obtain samples. Copies them into *this.
@@ -93,13 +94,13 @@ class curveSet
 public:
 
     //- Runtime type information
-    TypeName("curve");
+    TypeName("polyLine");
 
 
     // Constructors
 
         //- Construct from components
-        curveSet
+        polyLineSet
         (
             const word& name,
             const polyMesh& mesh,
@@ -109,7 +110,7 @@ public:
         );
 
         //- Construct from dictionary
-        curveSet
+        polyLineSet
         (
             const word& name,
             const polyMesh& mesh,
@@ -119,8 +120,7 @@ public:
 
 
     // Destructor
-
-        virtual ~curveSet();
+    virtual ~polyLineSet();
 
 
     // Member Functions