diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
index c59cb023a4..dfad8d4eaa 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
@@ -103,9 +103,9 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::autoMap
     const fvPatchFieldMapper& m
 )
 {
-    Field<Type>::autoMap(m);
-    refValue_.autoMap(m);
-    valueFraction_.autoMap(m);
+    m(*this, *this);
+    m(refValue_, refValue_);
+    m(valueFraction_, valueFraction_);
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index c63c7c53b6..3b46083d27 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -110,8 +110,8 @@ void Foam::tractionDisplacementFvPatchVectorField::autoMap
 )
 {
     fixedGradientFvPatchVectorField::autoMap(m);
-    traction_.autoMap(m);
-    pressure_.autoMap(m);
+    m(traction_, traction_);
+    m(pressure_, pressure_);
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
index 73fa4722f9..0c524bea64 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
@@ -115,8 +115,8 @@ void tractionDisplacementCorrectionFvPatchVectorField::autoMap
 )
 {
     fixedGradientFvPatchVectorField::autoMap(m);
-    traction_.autoMap(m);
-    pressure_.autoMap(m);
+    m(traction_, traction_);
+    m(pressure_, pressure_);
 }
 
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index f48855cbb6..72bb3306bd 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -611,7 +611,7 @@ fields/cloud/cloud.C
 
 Fields = fields/Fields
 
-$(Fields)/Field/FieldMapper.C
+$(Fields)/fieldMapper/fieldMapper.C
 $(Fields)/labelField/labelField.C
 $(Fields)/scalarField/scalarField.C
 $(Fields)/vectorField/vectorField.C
diff --git a/src/OpenFOAM/fields/Fields/Field/directFieldMapper.H b/src/OpenFOAM/fields/Fields/fieldMapper/directFieldMapper.H
similarity index 94%
rename from src/OpenFOAM/fields/Fields/Field/directFieldMapper.H
rename to src/OpenFOAM/fields/Fields/fieldMapper/directFieldMapper.H
index dd82b41c4c..c015a08741 100644
--- a/src/OpenFOAM/fields/Fields/Field/directFieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/fieldMapper/directFieldMapper.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,12 +38,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class directFieldMapper Declaration
+                      Class directFieldMapper Declaration
 \*---------------------------------------------------------------------------*/
 
 class directFieldMapper
 :
-    public FieldMapper
+    public fieldMapper
 {
     const labelUList& directAddressing_;
 
@@ -65,6 +65,7 @@ public:
             }
         }
 
+
     //- Destructor
     virtual ~directFieldMapper()
     {}
@@ -93,6 +94,7 @@ public:
         }
 };
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.C b/src/OpenFOAM/fields/Fields/fieldMapper/fieldMapper.C
similarity index 79%
rename from src/OpenFOAM/fields/Fields/Field/FieldMapper.C
rename to src/OpenFOAM/fields/Fields/fieldMapper/fieldMapper.C
index 2d29c7c935..b4281e1187 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.C
+++ b/src/OpenFOAM/fields/Fields/fieldMapper/fieldMapper.C
@@ -23,11 +23,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "FieldMapper.H"
+#include "fieldMapper.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::mapDistributeBase& Foam::FieldMapper::distributeMap() const
+const Foam::mapDistributeBase& Foam::fieldMapper::distributeMap() const
 {
     FatalErrorInFunction
         << "attempt to access null distributeMap"
@@ -36,7 +36,7 @@ const Foam::mapDistributeBase& Foam::FieldMapper::distributeMap() const
 }
 
 
-const Foam::labelUList& Foam::FieldMapper::directAddressing() const
+const Foam::labelUList& Foam::fieldMapper::directAddressing() const
 {
     FatalErrorInFunction
         << "attempt to access null direct addressing"
@@ -46,7 +46,7 @@ const Foam::labelUList& Foam::FieldMapper::directAddressing() const
 }
 
 
-const Foam::labelListList& Foam::FieldMapper::addressing() const
+const Foam::labelListList& Foam::fieldMapper::addressing() const
 {
     FatalErrorInFunction
         << "attempt to access null interpolation addressing"
@@ -56,7 +56,7 @@ const Foam::labelListList& Foam::FieldMapper::addressing() const
 }
 
 
-const Foam::scalarListList& Foam::FieldMapper::weights() const
+const Foam::scalarListList& Foam::fieldMapper::weights() const
 {
     FatalErrorInFunction
         << "attempt to access null interpolation weights"
@@ -68,7 +68,7 @@ const Foam::scalarListList& Foam::FieldMapper::weights() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::Field<Foam::scalar>> Foam::FieldMapper::operator()
+Foam::tmp<Foam::Field<Foam::scalar>> Foam::fieldMapper::operator()
 (
     const Field<scalar>& mapF
 ) const
@@ -77,7 +77,7 @@ Foam::tmp<Foam::Field<Foam::scalar>> Foam::FieldMapper::operator()
 }
 
 
-Foam::tmp<Foam::Field<Foam::vector>> Foam::FieldMapper::operator()
+Foam::tmp<Foam::Field<Foam::vector>> Foam::fieldMapper::operator()
 (
     const Field<vector>& mapF
 ) const
@@ -86,7 +86,7 @@ Foam::tmp<Foam::Field<Foam::vector>> Foam::FieldMapper::operator()
 }
 
 
-Foam::tmp<Foam::Field<Foam::sphericalTensor>> Foam::FieldMapper::operator()
+Foam::tmp<Foam::Field<Foam::sphericalTensor>> Foam::fieldMapper::operator()
 (
     const Field<sphericalTensor>& mapF
 ) const
@@ -95,7 +95,7 @@ Foam::tmp<Foam::Field<Foam::sphericalTensor>> Foam::FieldMapper::operator()
 }
 
 
-Foam::tmp<Foam::Field<Foam::symmTensor>> Foam::FieldMapper::operator()
+Foam::tmp<Foam::Field<Foam::symmTensor>> Foam::fieldMapper::operator()
 (
     const Field<symmTensor>& mapF
 ) const
@@ -104,7 +104,7 @@ Foam::tmp<Foam::Field<Foam::symmTensor>> Foam::FieldMapper::operator()
 }
 
 
-Foam::tmp<Foam::Field<Foam::tensor>> Foam::FieldMapper::operator()
+Foam::tmp<Foam::Field<Foam::tensor>> Foam::fieldMapper::operator()
 (
     const Field<tensor>& mapF
 ) const
@@ -113,7 +113,7 @@ Foam::tmp<Foam::Field<Foam::tensor>> Foam::FieldMapper::operator()
 }
 
 
-void Foam::FieldMapper::operator()
+void Foam::fieldMapper::operator()
 (
     Field<scalar>& f,
     const Field<scalar>& mapF
@@ -123,7 +123,7 @@ void Foam::FieldMapper::operator()
 }
 
 
-void Foam::FieldMapper::operator()
+void Foam::fieldMapper::operator()
 (
     Field<vector>& f,
     const Field<vector>& mapF
@@ -133,7 +133,7 @@ void Foam::FieldMapper::operator()
 }
 
 
-void Foam::FieldMapper::operator()
+void Foam::fieldMapper::operator()
 (
     Field<sphericalTensor>& f,
     const Field<sphericalTensor>& mapF
@@ -143,7 +143,7 @@ void Foam::FieldMapper::operator()
 }
 
 
-void Foam::FieldMapper::operator()
+void Foam::fieldMapper::operator()
 (
     Field<symmTensor>& f,
     const Field<symmTensor>& mapF
@@ -153,7 +153,7 @@ void Foam::FieldMapper::operator()
 }
 
 
-void Foam::FieldMapper::operator()
+void Foam::fieldMapper::operator()
 (
     Field<tensor>& f,
     const Field<tensor>& mapF
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/fieldMapper/fieldMapper.H
similarity index 95%
rename from src/OpenFOAM/fields/Fields/Field/FieldMapper.H
rename to src/OpenFOAM/fields/Fields/fieldMapper/fieldMapper.H
index 08a9dee56f..ee166b6c16 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/fieldMapper/fieldMapper.H
@@ -22,15 +22,15 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::FieldMapper
+    Foam::fieldMapper
 
 Description
     Abstract base class to hold the Field mapping addressing and weights.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef FieldMapper_H
-#define FieldMapper_H
+#ifndef fieldMapper_H
+#define fieldMapper_H
 
 #include "Field.H"
 #include "mapDistributeBase.H"
@@ -41,10 +41,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class FieldMapper Declaration
+                           Class fieldMapper Declaration
 \*---------------------------------------------------------------------------*/
 
-class FieldMapper
+class fieldMapper
 {
     // Private member functions
 
@@ -60,12 +60,12 @@ public:
     // Constructors
 
         //- Null constructor
-        FieldMapper()
+        fieldMapper()
         {}
 
 
     //- Destructor
-    virtual ~FieldMapper()
+    virtual ~fieldMapper()
     {}
 
 
@@ -166,7 +166,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "FieldMapperTemplates.C"
+    #include "fieldMapperTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapperTemplates.C b/src/OpenFOAM/fields/Fields/fieldMapper/fieldMapperTemplates.C
similarity index 93%
rename from src/OpenFOAM/fields/Fields/Field/FieldMapperTemplates.C
rename to src/OpenFOAM/fields/Fields/fieldMapper/fieldMapperTemplates.C
index c504c682f2..306fa2ba39 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapperTemplates.C
+++ b/src/OpenFOAM/fields/Fields/fieldMapper/fieldMapperTemplates.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "FieldMapper.H"
+#include "fieldMapper.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::FieldMapper::map(Field<Type>& f, const Field<Type>& mapF) const
+void Foam::fieldMapper::map(Field<Type>& f, const Field<Type>& mapF) const
 {
     if (distributed())
     {
@@ -87,7 +87,7 @@ void Foam::FieldMapper::map(Field<Type>& f, const Field<Type>& mapF) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::FieldMapper::map
+Foam::tmp<Foam::Field<Type>> Foam::fieldMapper::map
 (
     const Field<Type>& mapF
 ) const
@@ -99,7 +99,7 @@ Foam::tmp<Foam::Field<Type>> Foam::FieldMapper::map
 
 
 template<class Type>
-void Foam::FieldMapper::operator()
+void Foam::fieldMapper::operator()
 (
     Field<Type>& f,
     const tmp<Field<Type>>& tmapF
@@ -111,7 +111,7 @@ void Foam::FieldMapper::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::FieldMapper::operator()
+Foam::tmp<Foam::Field<Type>> Foam::fieldMapper::operator()
 (
     const tmp<Field<Type>>& tmapF
 ) const
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.H
index 0e5ea68654..0beeed8129 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
 #define pointPatchFieldMapper_H
 
 #include "primitiveFields.H"
-#include "FieldMapper.H"
+#include "fieldMapper.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ namespace Foam
 
 class pointPatchFieldMapper
 :
-    public FieldMapper
+    public fieldMapper
 {
 
 public:
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
index 46508cd383..92569641bb 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
@@ -32,7 +32,7 @@ Description
 #ifndef morphFieldMapper_H
 #define morphFieldMapper_H
 
-#include "FieldMapper.H"
+#include "fieldMapper.H"
 #include "Map.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,7 +46,7 @@ namespace Foam
 
 class morphFieldMapper
 :
-    public FieldMapper
+    public fieldMapper
 {
 
 public:
@@ -73,7 +73,6 @@ public:
 
         //- Return list of inserted objects
         virtual const labelList& insertedObjectLabels() const = 0;
-
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.H
index 6f97417e54..e8e1cf4ff3 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.H
@@ -33,7 +33,7 @@ Description
 #define fvPatchFieldMapper_H
 
 #include "primitiveFields.H"
-#include "FieldMapper.H"
+#include "fieldMapper.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ namespace Foam
 
 class fvPatchFieldMapper
 :
-    public FieldMapper
+    public fieldMapper
 {
 
 public: