diff --git a/src/ASM/SplineField.h b/src/ASM/Field.h
similarity index 75%
rename from src/ASM/SplineField.h
rename to src/ASM/Field.h
index 4da889cc..e1365c6b 100644
--- a/src/ASM/SplineField.h
+++ b/src/ASM/Field.h
@@ -1,18 +1,18 @@
 // $Id$
 //==============================================================================
 //!
-//! \file SplineField.h
+//! \file Field.h
 //!
 //! \date Mar 28 2011
 //!
 //! \author Runar Holdahl / SINTEF
 //!
-//! \brief Base class for spline-based finite element scalar fields.
+//! \brief Base class for scalar fields.
 //!
 //==============================================================================
 
-#ifndef _SPLINE_FIELD_H
-#define _SPLINE_FIELD_H
+#ifndef _FIELD_H
+#define _FIELD_H
 
 #include "MatVec.h"
 
@@ -21,26 +21,26 @@ class Vec3;
 
 
 /*!
-  \brief Base class for spline-based finite element scalar fields.
+  \brief Base class for scalar fields.
 
   \details This class incapsulates the data and methods needed
-  to store and evaluate a spline finite element scalar field.
-  This is an abstract base class and the fields associated with
-  specific spline objects are implemented as subclasses,
-  for instance 1D, 2D and 3D spline formulations.
+  to store and evaluate a scalar field. This is an abstract base 
+  class and the fields associated with a specific field type is 
+  implemented as subclasses, for instance 1D, 2D and 3D spline 
+  formulations or Lagrange formulations.
 */
 
-class SplineField
+class Field
 {
 protected:
   //! \brief The constructor sets the number of space dimensions and fields.
   //! \param[in] n Number of space dimensions (1, 2 or 3)
-  //! \param[in] name Name of spline field
-  SplineField(unsigned char n, char* name = NULL) : nsd(n), fieldname(name) {}
+  //! \param[in] name Name of field
+  Field(unsigned char n, char* name = NULL) : nsd(n), fieldname(name) {}
 
 public:
   //! \brief Empty destructor
-  virtual ~SplineField() {}
+  virtual ~Field() {}
 
   //! \brief Returns number of space dimensions.
   unsigned char getNoSpaceDim() const { return nsd; }
@@ -51,10 +51,10 @@ public:
   //! \brief Returns number of control points.
   int getNoNodes() const { return nno; }
 
-  //! \brief Returns name of spline field.
+  //! \brief Returns name of field.
   const char* getFieldName() const { return fieldname; }
 
-  //! \brief Sets the name of the spline field.
+  //! \brief Sets the name of the field.
   void setFieldName(const char* name) { fieldname = const_cast<char*>(name); }
 
   //! \brief Initializes the field values.
@@ -90,7 +90,7 @@ protected:
   unsigned char nsd; //!< Number of space dimensions
   int nelm;          //!< Number of elements/knot-spans
   int nno;           //!< Number of nodes/control points
-  char* fieldname;   //!< Name of spline element field
+  char* fieldname;   //!< Name of field
   Vector values;     //!< Field values
 };
 
diff --git a/src/ASM/SplineFields.h b/src/ASM/Fields.h
similarity index 77%
rename from src/ASM/SplineFields.h
rename to src/ASM/Fields.h
index 4c04bff3..bf725054 100644
--- a/src/ASM/SplineFields.h
+++ b/src/ASM/Fields.h
@@ -1,18 +1,18 @@
 // $Id$
 //==============================================================================
 //!
-//! \file SplineFields.h
+//! \file Fields.h
 //!
 //! \date Mar 28 2011
 //!
 //! \author Runar Holdahl / SINTEF
 //!
-//! \brief Base class for spline-based finite element vector fields.
+//! \brief Base class for vector fields.
 //!
 //==============================================================================
 
-#ifndef _SPLINE_FIELDS_H
-#define _SPLINE_FIELDS_H
+#ifndef _FIELDS_H
+#define _FIELDS_H
 
 #include "MatVec.h"
 
@@ -21,26 +21,26 @@ class Vec3;
 
 
 /*!
-  \brief Base class for spline-based finite element vector fields.
+  \brief Base class for vector fields.
 
   \details This class incapsulates the data and methods needed
-  to store and evaluate a spline finite element vector field.
-  This is an abstract base class and the fields associated with
-  specific spline objects are implemented as subclasses,
-  for instance 1D, 2D and 3D spline formulations.
+  to store and evaluate a vector field. This is an abstract base 
+  class and the fields of a specific type is implemented as a 
+  subclass, for instance 1D, 2D and 3D spline formulations or 
+  Lagrange formulations.
 */
 
-class SplineFields
+class Fields
 {
 protected:
   //! \brief The constructor sets the field name.
   //! \param[in] n Number of space dimensions (1, 2 or 3)
-  //! \param[in] name Name of spline field
-  SplineFields(unsigned char n, char* name = NULL) : nsd(n), fieldname(name) {}
+  //! \param[in] name Name of fields
+  Fields(unsigned char n, char* name = NULL) : nsd(n), fieldname(name) {}
 
 public:
   //! \brief Empty destructor.
-  virtual ~SplineFields() {}
+  virtual ~Fields() {}
 
   //! \brief Returns number of space dimensions.
   unsigned char getNoSpaceDim() const { return nsd; }
@@ -54,10 +54,10 @@ public:
   //! \brief Returns number of control points.
   int getNoNodes() const { return nno; }
 
-  //! \brief Returns name of spline field.
+  //! \brief Returns name of fields.
   const char* getFieldName() const { return fieldname; }
 
-  //! \brief Sets the name of the spline field.
+  //! \brief Sets the name of the field.
   void setFieldName(char* name) { fieldname = name; }
 
   //! \brief Initializes the field values.
@@ -97,7 +97,7 @@ protected:
   unsigned char nf;  //!< Number of fields
   int nelm;          //!< Number of elements/knot-spans
   int nno;           //!< Number of nodes/control points
-  char* fieldname;   //!< Name of spline element field
+  char* fieldname;   //!< Name of fields
   Vector values;     //!< Field values
 };
 
diff --git a/src/ASM/SplineField2D.C b/src/ASM/SplineField2D.C
index 604b9433..e9ba41b9 100644
--- a/src/ASM/SplineField2D.C
+++ b/src/ASM/SplineField2D.C
@@ -20,7 +20,7 @@
 
 
 SplineField2D::SplineField2D(Go::SplineSurface *geometry, char* name)
-  : SplineField(2,name), surf(geometry) 
+  : Field(2,name), surf(geometry) 
 {
   const int n1 = surf->numCoefs_u();
   const int n2 = surf->numCoefs_v();
diff --git a/src/ASM/SplineField2D.h b/src/ASM/SplineField2D.h
index bc6517b9..d7074ba1 100644
--- a/src/ASM/SplineField2D.h
+++ b/src/ASM/SplineField2D.h
@@ -14,7 +14,7 @@
 #ifndef _SPLINE_FIELD_2D_H
 #define _SPLINE_FIELD_2D_H
 
-#include "SplineField.h"
+#include "Field.h"
 
 namespace Go {
   class SplineSurface;
@@ -29,7 +29,7 @@ namespace Go {
 */
 
 
-class SplineField2D : public SplineField
+class SplineField2D : public Field
 {
 public:
   //! \brief The constructor sets the number of space dimensions and fields.
diff --git a/src/ASM/SplineField3D.C b/src/ASM/SplineField3D.C
index 0c7de3a4..14da8f41 100644
--- a/src/ASM/SplineField3D.C
+++ b/src/ASM/SplineField3D.C
@@ -24,7 +24,7 @@ namespace Go {
 
 
 SplineField3D::SplineField3D(Go::SplineVolume *geometry, char* name)
-  : SplineField(3,name), vol(geometry) 
+  : Field(3,name), vol(geometry) 
 {
   const int n1 = vol->numCoefs(0);
   const int n2 = vol->numCoefs(1);
diff --git a/src/ASM/SplineField3D.h b/src/ASM/SplineField3D.h
index a0d2e0b9..53a72489 100644
--- a/src/ASM/SplineField3D.h
+++ b/src/ASM/SplineField3D.h
@@ -14,7 +14,7 @@
 #ifndef _SPLINE_FIELD_3D_H
 #define _SPLINE_FIELD_3D_H
 
-#include "SplineField.h"
+#include "Field.h"
 
 namespace Go {
   class SplineVolume;
@@ -29,7 +29,7 @@ namespace Go {
 */
 
 
-class SplineField3D : public SplineField
+class SplineField3D : public Field
 {
 public:
   //! \brief The constructor sets the number of space dimensions and fields.
diff --git a/src/ASM/SplineFields2D.C b/src/ASM/SplineFields2D.C
index a8bef8d4..259d6958 100644
--- a/src/ASM/SplineFields2D.C
+++ b/src/ASM/SplineFields2D.C
@@ -23,7 +23,7 @@
 
 
 SplineFields2D::SplineFields2D(Go::SplineSurface *geometry, char* name)
-  : SplineFields(2,name),  surf(geometry) 
+  : Fields(2,name),  surf(geometry) 
 {
   const int n1 = surf->numCoefs_u();
   const int n2 = surf->numCoefs_v();
diff --git a/src/ASM/SplineFields2D.h b/src/ASM/SplineFields2D.h
index 05c2550e..df0bb103 100644
--- a/src/ASM/SplineFields2D.h
+++ b/src/ASM/SplineFields2D.h
@@ -14,7 +14,7 @@
 #ifndef _SPLINE_FIELDS_2D_H
 #define _SPLINE_FIELDS_2D_H
 
-#include "SplineFields.h"
+#include "Fields.h"
 
 namespace Go {
   class SplineSurface;
@@ -29,7 +29,7 @@ namespace Go {
 */
 
 
-class SplineFields2D : public SplineFields
+class SplineFields2D : public Fields
 {
 public:
   //! \brief The constructor sets the field name.
diff --git a/src/ASM/SplineFields3D.C b/src/ASM/SplineFields3D.C
index d3bc7908..19fe03c6 100644
--- a/src/ASM/SplineFields3D.C
+++ b/src/ASM/SplineFields3D.C
@@ -25,7 +25,7 @@ namespace Go {
 
 
 SplineFields3D::SplineFields3D(Go::SplineVolume *geometry, char* name)
-  : SplineFields(3,name), vol(geometry) 
+  : Fields(3,name), vol(geometry) 
 {
   const int n1 = vol->numCoefs(0);
   const int n2 = vol->numCoefs(1);
diff --git a/src/ASM/SplineFields3D.h b/src/ASM/SplineFields3D.h
index a9505141..28479a8d 100644
--- a/src/ASM/SplineFields3D.h
+++ b/src/ASM/SplineFields3D.h
@@ -14,7 +14,7 @@
 #ifndef _SPLINE_FIELDS_3D_H
 #define _SPLINE_FIELDS_3D_H
 
-#include "SplineFields.h"
+#include "Fields.h"
 
 namespace Go {
   class SplineVolume;
@@ -29,7 +29,7 @@ namespace Go {
 */
 
 
-class SplineFields3D : public SplineFields
+class SplineFields3D : public Fields
 {
 public:
   //! \brief The constructor sets the field name.