diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 558b5f2510..939ae98ad2 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -83,7 +83,7 @@ primitives/Vector2D/vector2D/vector2D.C
 
 primitives/complex/complex.C
 primitives/globalIndexAndTransform/globalIndexAndTransform.C
-primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
+primitives/transform/transformer/transformer.C
 primitives/quaternion/quaternion.C
 primitives/septernion/septernion.C
 primitives/triad/triad.C
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 41a91f23ba..5a8031fc8a 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -39,7 +39,7 @@ namespace Foam
 template<>
 void Foam::mapDistribute::transform::operator()
 (
-    const vectorTensorTransform&,
+    const transformer&,
     const bool,
     List<label>&
 ) const
@@ -70,7 +70,7 @@ void Foam::mapDistribute::transform::operator()
 template<>
 void Foam::mapDistribute::transform::operator()
 (
-    const vectorTensorTransform&,
+    const transformer&,
     const bool,
     List<scalar>&
 ) const
@@ -101,7 +101,7 @@ void Foam::mapDistribute::transform::operator()
 template<>
 void Foam::mapDistribute::transform::operator()
 (
-    const vectorTensorTransform&,
+    const transformer&,
     const bool,
     List<bool>&
 ) const
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index 6dc5b7671f..1282ccdc39 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -135,7 +135,7 @@ SourceFiles
 
 #include "mapDistributeBase.H"
 #include "transformList.H"
-#include "vectorTensorTransform.H"
+#include "transformer.H"
 #include "coupledPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -211,7 +211,7 @@ public:
             template<class Type>
             void operator()
             (
-                const vectorTensorTransform& vt,
+                const transformer& vt,
                 const bool forward,
                 List<Type>& fld
             ) const
@@ -223,7 +223,7 @@ public:
             template<class Type>
             void operator()
             (
-                const vectorTensorTransform& vt,
+                const transformer& vt,
                 const bool forward,
                 List<List<Type>>& flds
             ) const
@@ -263,7 +263,7 @@ public:
 
             void operator()
             (
-                const vectorTensorTransform& vt,
+                const transformer& vt,
                 const bool forward,
                 List<point>& fld
             ) const
@@ -280,7 +280,7 @@ public:
             }
             void operator()
             (
-                const vectorTensorTransform& vt,
+                const transformer& vt,
                 const bool forward,
                 List<List<point>>& flds
             ) const
@@ -567,7 +567,7 @@ public:
 template<>
 void mapDistribute::transform::operator()
 (
-    const vectorTensorTransform&,
+    const transformer&,
     const bool,
     List<label>&
 ) const;
@@ -599,7 +599,7 @@ void mapDistribute::transform::operator()
 template<>
 void mapDistribute::transform::operator()
 (
-    const vectorTensorTransform&,
+    const transformer&,
     const bool,
     List<scalar>&
 ) const;
@@ -625,7 +625,7 @@ void mapDistribute::transform::operator()
 template<>
 void mapDistribute::transform::operator()
 (
-    const vectorTensorTransform&,
+    const transformer&,
     const bool,
     List<bool>&
 ) const;
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 7d42f20404..b125ad3588 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -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
@@ -73,12 +73,12 @@ void Foam::mapDistribute::applyTransforms
     const TransformOp& top
 ) const
 {
-    const List<vectorTensorTransform>& totalTransform =
+    const List<transformer>& totalTransform =
         globalTransforms.transformPermutations();
 
     forAll(totalTransform, trafoI)
     {
-        const vectorTensorTransform& vt = totalTransform[trafoI];
+        const transformer& vt = totalTransform[trafoI];
         const labelList& elems = transformElements_[trafoI];
         label n = transformStart_[trafoI];
 
@@ -103,12 +103,12 @@ void Foam::mapDistribute::applyInverseTransforms
     const TransformOp& top
 ) const
 {
-    const List<vectorTensorTransform>& totalTransform =
+    const List<transformer>& totalTransform =
         globalTransforms.transformPermutations();
 
     forAll(totalTransform, trafoI)
     {
-        const vectorTensorTransform& vt = totalTransform[trafoI];
+        const transformer& vt = totalTransform[trafoI];
         const labelList& elems = transformElements_[trafoI];
         label n = transformStart_[trafoI];
 
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
index 18ac98ebe1..4752603f28 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.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
@@ -47,7 +47,7 @@ public:
     template<class T>
     void operator()
     (
-        const vectorTensorTransform& vt,
+        const transformer& vt,
         const bool forward,
         List<T>& fld
     ) const
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
index 853f1a3a0b..10db88b933 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
@@ -40,9 +40,9 @@ namespace Foam
 
 Foam::label Foam::globalIndexAndTransform::matchTransform
 (
-    const List<vectorTensorTransform>& refTransforms,
+    const List<transformer>& refTransforms,
     label& matchedRefTransformI,
-    const vectorTensorTransform& testTransform,
+    const transformer& testTransform,
     scalar tolerance,
     bool checkBothSigns
 ) const
@@ -51,7 +51,7 @@ Foam::label Foam::globalIndexAndTransform::matchTransform
 
     forAll(refTransforms, i)
     {
-        const vectorTensorTransform& refTransform = refTransforms[i];
+        const transformer& refTransform = refTransforms[i];
 
         scalar maxVectorMag = sqrt
         (
@@ -128,7 +128,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
 {
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
-    DynamicList<vectorTensorTransform> localTransforms;
+    DynamicList<transformer> localTransforms;
     DynamicField<scalar> localTols;
 
     label dummyMatch = -1;
@@ -163,7 +163,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
                 if (mag(sepVec) > small)
                 {
-                    vectorTensorTransform transform(sepVec);
+                    transformer transform(sepVec);
 
                     if
                     (
@@ -188,7 +188,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
                 if (mag(transT - I) > small)
                 {
-                    vectorTensorTransform transform(transT);
+                    transformer transform(transT);
 
                     if
                     (
@@ -212,7 +212,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
 
     // Collect transforms on master
-    List<List<vectorTensorTransform>> allTransforms(Pstream::nProcs());
+    List<List<transformer>> allTransforms(Pstream::nProcs());
     allTransforms[Pstream::myProcNo()] = localTransforms;
     Pstream::gatherList(allTransforms);
 
@@ -227,12 +227,12 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
         forAll(allTransforms, proci)
         {
-            const List<vectorTensorTransform>& procTransVecs =
+            const List<transformer>& procTransVecs =
                 allTransforms[proci];
 
             forAll(procTransVecs, pSVI)
             {
-                const vectorTensorTransform& transform = procTransVecs[pSVI];
+                const transformer& transform = procTransVecs[pSVI];
 
                 if (mag(transform.t()) > small || transform.hasR())
                 {
@@ -268,7 +268,7 @@ void Foam::globalIndexAndTransform::determineTransformPermutations()
 
     forAll(transformPermutations_, tPI)
     {
-        vectorTensorTransform transform;
+        transformer transform;
 
         label transformIndex = tPI;
 
@@ -337,7 +337,7 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
 
                 if (mag(sepVec) > small)
                 {
-                    vectorTensorTransform t(sepVec);
+                    transformer t(sepVec);
 
                     label matchTransI;
                     label sign = matchTransform
@@ -357,7 +357,7 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
 
                 if (mag(transT - I) > small)
                 {
-                    vectorTensorTransform t(transT);
+                    transformer t(transT);
 
                     label matchTransI;
                     label sign = matchTransform
@@ -447,7 +447,7 @@ Foam::globalIndexAndTransform::globalIndexAndTransform(const polyMesh& mesh)
         forAll(transforms_, i)
         {
             Info<< '\t' << i << '\t';
-            const vectorTensorTransform& trafo = transforms_[i];
+            const transformer& trafo = transforms_[i];
             if (trafo.hasR())
             {
                  Info<< trafo.t() << '\t' << trafo.R();
@@ -480,7 +480,7 @@ Foam::globalIndexAndTransform::globalIndexAndTransform(const polyMesh& mesh)
         forAll(transformPermutations_, i)
         {
             Info<< '\t' << i << '\t';
-            const vectorTensorTransform& trafo = transformPermutations_[i];
+            const transformer& trafo = transformPermutations_[i];
             if (trafo.hasR())
             {
                  Info<< trafo.t() << '\t' << trafo.R();
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
index 3348612805..677474bc80 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
@@ -45,7 +45,7 @@ SourceFiles
 #define globalIndexAndTransform_H
 
 #include "labelPair.H"
-#include "vectorTensorTransform.H"
+#include "transformer.H"
 #include "HashSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -98,13 +98,13 @@ private:
         //  stores the two transforms, not the eight permutations.
         //  Any point can not be on more than three transforms but overall
         //  the mesh can have more than three.
-        List<vectorTensorTransform> transforms_;
+        List<transformer> transforms_;
 
         //- The permutations of the transforms, stored for lookup
         //  efficiency.  If there are n transforms, then there are
         //  (3^n) permutations, including the no-transformation
         //  transform.
-        List<vectorTensorTransform> transformPermutations_;
+        List<transformer> transformPermutations_;
 
         //- Index of identity transform.
         label nullTransformIndex_;
@@ -133,9 +133,9 @@ private:
         //  sign of the match, or 0 if none matches.
         label matchTransform
         (
-            const List<vectorTensorTransform>& refTransforms,
+            const List<transformer>& refTransforms,
             label& matchedRefTransformI,
-            const vectorTensorTransform& testTransform,
+            const transformer& testTransform,
             scalar tolerance,
             bool checkBothSigns
         ) const;
@@ -239,10 +239,10 @@ public:
         inline label nIndependentTransforms() const;
 
         //- Return access to the stored independent transforms
-        inline const List<vectorTensorTransform>& transforms() const;
+        inline const List<transformer>& transforms() const;
 
         //- Return access to the permuted transforms
-        inline const List<vectorTensorTransform>&
+        inline const List<transformer>&
         transformPermutations() const;
 
         //- Return the transformIndex (index in transformPermutations)
@@ -254,7 +254,7 @@ public:
 
         //- Access the overall (permuted) transform corresponding
         //  to the transformIndex
-        inline const vectorTensorTransform& transform
+        inline const transformer& transform
         (
             label transformIndex
         ) const;
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
index ce3a0f06d8..ee11d58f0a 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.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
@@ -187,7 +187,7 @@ Foam::label Foam::globalIndexAndTransform::addToTransformIndex
                 // once +1)
                 bool antiCyclic = false;
 
-                const vectorTensorTransform& vt = transforms_[matchTransI];
+                const transformer& vt = transforms_[matchTransI];
                 if (mag(vt.t()) < small && vt.hasR())
                 {
                     const tensor& R = vt.R();
@@ -374,14 +374,14 @@ Foam::label Foam::globalIndexAndTransform::nIndependentTransforms() const
 }
 
 
-const Foam::List<Foam::vectorTensorTransform>&
+const Foam::List<Foam::transformer>&
 Foam::globalIndexAndTransform::transforms() const
 {
     return transforms_;
 }
 
 
-const Foam::List<Foam::vectorTensorTransform>&
+const Foam::List<Foam::transformer>&
 Foam::globalIndexAndTransform::transformPermutations() const
 {
     return transformPermutations_;
@@ -401,7 +401,7 @@ Foam::globalIndexAndTransform::patchTransformSign() const
 }
 
 
-const Foam::vectorTensorTransform& Foam::globalIndexAndTransform::transform
+const Foam::transformer& Foam::globalIndexAndTransform::transform
 (
     label transformIndex
 ) const
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C b/src/OpenFOAM/primitives/transform/transformer/transformer.C
similarity index 68%
rename from src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
rename to src/OpenFOAM/primitives/transform/transformer/transformer.C
index 7f35974944..55912ff71b 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
+++ b/src/OpenFOAM/primitives/transform/transformer/transformer.C
@@ -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
@@ -23,16 +23,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vectorTensorTransform.H"
+#include "transformer.H"
 #include "IOstreams.H"
 #include "OStringStream.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* const Foam::vectorTensorTransform::typeName =
-    "vectorTensorTransform";
+const char* const Foam::transformer::typeName =
+    "transformer";
 
-const Foam::vectorTensorTransform Foam::vectorTensorTransform::zero
+const Foam::transformer Foam::transformer::zero
 (
     Zero,
     Zero,
@@ -40,7 +40,7 @@ const Foam::vectorTensorTransform Foam::vectorTensorTransform::zero
 );
 
 
-const Foam::vectorTensorTransform Foam::vectorTensorTransform::I
+const Foam::transformer Foam::transformer::I
 (
     Zero,
     sphericalTensor::I,
@@ -50,7 +50,7 @@ const Foam::vectorTensorTransform Foam::vectorTensorTransform::I
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::vectorTensorTransform::vectorTensorTransform(Istream& is)
+Foam::transformer::transformer(Istream& is)
 {
     is  >> *this;
 }
@@ -58,7 +58,7 @@ Foam::vectorTensorTransform::vectorTensorTransform(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::word Foam::name(const vectorTensorTransform& s)
+Foam::word Foam::name(const transformer& s)
 {
     OStringStream buf;
 
@@ -69,7 +69,7 @@ Foam::word Foam::name(const vectorTensorTransform& s)
 
 
 template<>
-Foam::tmp<Foam::Field<bool>> Foam::vectorTensorTransform::transform
+Foam::tmp<Foam::Field<bool>> Foam::transformer::transform
 (
     const Field<bool>& fld
 ) const
@@ -77,7 +77,7 @@ Foam::tmp<Foam::Field<bool>> Foam::vectorTensorTransform::transform
     return fld;
 }
 template<>
-Foam::tmp<Foam::Field<Foam::label>> Foam::vectorTensorTransform::transform
+Foam::tmp<Foam::Field<Foam::label>> Foam::transformer::transform
 (
     const Field<label>& fld
 ) const
@@ -85,7 +85,7 @@ Foam::tmp<Foam::Field<Foam::label>> Foam::vectorTensorTransform::transform
     return fld;
 }
 template<>
-Foam::tmp<Foam::Field<Foam::scalar>> Foam::vectorTensorTransform::transform
+Foam::tmp<Foam::Field<Foam::scalar>> Foam::transformer::transform
 (
     const Field<scalar>& fld
 ) const
@@ -96,24 +96,24 @@ Foam::tmp<Foam::Field<Foam::scalar>> Foam::vectorTensorTransform::transform
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, vectorTensorTransform& tr)
+Foam::Istream& Foam::operator>>(Istream& is, transformer& tr)
 {
-    // Read beginning of vectorTensorTransform
-    is.readBegin("vectorTensorTransform");
+    // Read beginning of transformer
+    is.readBegin("transformer");
 
     is  >> tr.t_ >> tr.R_ >> tr.hasR_;
 
-    // Read end of vectorTensorTransform
-    is.readEnd("vectorTensorTransform");
+    // Read end of transformer
+    is.readEnd("transformer");
 
     // Check state of Istream
-    is.check("operator>>(Istream&, vectorTensorTransform&)");
+    is.check("operator>>(Istream&, transformer&)");
 
     return is;
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const vectorTensorTransform& tr)
+Foam::Ostream& Foam::operator<<(Ostream& os, const transformer& tr)
 {
     os  << token::BEGIN_LIST
         << tr.t() << token::SPACE << tr.R() << token::SPACE << tr.hasR()
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H b/src/OpenFOAM/primitives/transform/transformer/transformer.H
similarity index 68%
rename from src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
rename to src/OpenFOAM/primitives/transform/transformer/transformer.H
index 48f9f5f357..f47602e339 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
+++ b/src/OpenFOAM/primitives/transform/transformer/transformer.H
@@ -22,21 +22,21 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::vectorTensorTransform
+    Foam::transformer
 
 Description
     Vector-tensor class used to perform translations and rotations in
     3D space.
 
 SourceFiles
-    vectorTensorTransformI.H
-    vectorTensorTransform.C
-    vectorTensorTransformTemplates.C
+    transformerI.H
+    transformer.C
+    transformerTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vectorTensorTransform_H
-#define vectorTensorTransform_H
+#ifndef transformer_H
+#define transformer_H
 
 #include "tensor.H"
 #include "word.H"
@@ -51,16 +51,16 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-class vectorTensorTransform;
-Istream& operator>>(Istream& is, vectorTensorTransform&);
-Ostream& operator<<(Ostream& os, const vectorTensorTransform& C);
+class transformer;
+Istream& operator>>(Istream& is, transformer&);
+Ostream& operator<<(Ostream& os, const transformer& C);
 
 
 /*---------------------------------------------------------------------------*\
-                    Class vectorTensorTransform Declaration
+                    Class transformer Declaration
 \*---------------------------------------------------------------------------*/
 
-class vectorTensorTransform
+class transformer
 {
     // private data
 
@@ -82,35 +82,35 @@ public:
 
         static const char* const typeName;
 
-        static const vectorTensorTransform zero;
+        static const transformer zero;
 
-        static const vectorTensorTransform I;
+        static const transformer I;
 
 
     // Constructors
 
         //- Construct null
-        inline vectorTensorTransform();
+        inline transformer();
 
         //- Construct given a translation vector, rotation tensor and
         //  hasR bool
-        inline vectorTensorTransform
+        inline transformer
         (
             const vector& t,
             const tensor& R,
             bool hasR = true
         );
 
-        //- Construct a pure translation vectorTensorTransform given a
+        //- Construct a pure translation transformer given a
         //  translation vector
-        inline explicit vectorTensorTransform(const vector& t);
+        inline explicit transformer(const vector& t);
 
-        //- Construct a pure rotation vectorTensorTransform given a
+        //- Construct a pure rotation transformer given a
         //  rotation tensor
-        inline explicit vectorTensorTransform(const tensor& R);
+        inline explicit transformer(const tensor& R);
 
         //- Construct from Istream
-        vectorTensorTransform(Istream&);
+        transformer(Istream&);
 
 
     // Member Functions
@@ -164,7 +164,7 @@ public:
 
     // Member Operators
 
-        inline void operator&=(const vectorTensorTransform&);
+        inline void operator&=(const transformer&);
 
         inline void operator=(const vector&);
         inline void operator+=(const vector&);
@@ -176,33 +176,33 @@ public:
 
     // IOstream Operators
 
-        friend Istream& operator>>(Istream& is, vectorTensorTransform&);
+        friend Istream& operator>>(Istream& is, transformer&);
 
-        friend Ostream& operator<<(Ostream& os, const vectorTensorTransform&);
+        friend Ostream& operator<<(Ostream& os, const transformer&);
 };
 
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-//- Return the inverse of the given vectorTensorTransform
-inline vectorTensorTransform inv(const vectorTensorTransform& tr);
+//- Return the inverse of the given transformer
+inline transformer inv(const transformer& tr);
 
 
-//- Return a string representation of a vectorTensorTransform
-word name(const vectorTensorTransform&);
+//- Return a string representation of a transformer
+word name(const transformer&);
 
 
-//- Data associated with vectorTensorTransform type are contiguous
+//- Data associated with transformer type are contiguous
 template<>
-inline bool contiguous<vectorTensorTransform>() {return true;}
+inline bool contiguous<transformer>() {return true;}
 
 //- Template specialisations
 template<>
-tmp<Field<bool>> vectorTensorTransform::transform(const Field<bool>&) const;
+tmp<Field<bool>> transformer::transform(const Field<bool>&) const;
 template<>
-tmp<Field<label>> vectorTensorTransform::transform(const Field<label>&) const;
+tmp<Field<label>> transformer::transform(const Field<label>&) const;
 template<>
-tmp<Field<scalar>> vectorTensorTransform::transform(const Field<scalar>&)
+tmp<Field<scalar>> transformer::transform(const Field<scalar>&)
 const;
 
 
@@ -210,44 +210,44 @@ const;
 
 inline bool operator==
 (
-    const vectorTensorTransform& tr1,
-    const vectorTensorTransform& tr2
+    const transformer& tr1,
+    const transformer& tr2
 );
 
 
 inline bool operator!=
 (
-    const vectorTensorTransform& tr1,
-    const vectorTensorTransform& tr2
+    const transformer& tr1,
+    const transformer& tr2
 
 );
 
 
-inline vectorTensorTransform operator+
+inline transformer operator+
 (
-    const vectorTensorTransform& tr,
+    const transformer& tr,
     const vector& t
 );
 
 
-inline vectorTensorTransform operator+
+inline transformer operator+
 (
     const vector& t,
-    const vectorTensorTransform& tr
+    const transformer& tr
 );
 
 
-inline vectorTensorTransform operator-
+inline transformer operator-
 (
-    const vectorTensorTransform& tr,
+    const transformer& tr,
     const vector& t
 );
 
 
-inline vectorTensorTransform operator&
+inline transformer operator&
 (
-    const vectorTensorTransform& tr1,
-    const vectorTensorTransform& tr2
+    const transformer& tr1,
+    const transformer& tr2
 );
 
 
@@ -257,10 +257,10 @@ inline vectorTensorTransform operator&
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "vectorTensorTransformI.H"
+#include "transformerI.H"
 
 #ifdef NoRepository
-    #include "vectorTensorTransformTemplates.C"
+    #include "transformerTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H b/src/OpenFOAM/primitives/transform/transformer/transformerI.H
similarity index 62%
rename from src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
rename to src/OpenFOAM/primitives/transform/transformer/transformerI.H
index 614f8d9345..987153408c 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
+++ b/src/OpenFOAM/primitives/transform/transformer/transformerI.H
@@ -25,7 +25,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::vectorTensorTransform::vectorTensorTransform()
+inline Foam::transformer::transformer()
 :
     t_(Zero),
     R_(sphericalTensor::I),
@@ -33,7 +33,7 @@ inline Foam::vectorTensorTransform::vectorTensorTransform()
 {}
 
 
-inline Foam::vectorTensorTransform::vectorTensorTransform
+inline Foam::transformer::transformer
 (
     const vector& t,
     const tensor& R,
@@ -46,7 +46,7 @@ inline Foam::vectorTensorTransform::vectorTensorTransform
 {}
 
 
-inline Foam::vectorTensorTransform::vectorTensorTransform(const vector& t)
+inline Foam::transformer::transformer(const vector& t)
 :
     t_(t),
     R_(sphericalTensor::I),
@@ -54,7 +54,7 @@ inline Foam::vectorTensorTransform::vectorTensorTransform(const vector& t)
 {}
 
 
-inline Foam::vectorTensorTransform::vectorTensorTransform(const tensor& R)
+inline Foam::transformer::transformer(const tensor& R)
 :
     t_(Zero),
     R_(R),
@@ -64,31 +64,31 @@ inline Foam::vectorTensorTransform::vectorTensorTransform(const tensor& R)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const Foam::vector& Foam::vectorTensorTransform::t() const
+inline const Foam::vector& Foam::transformer::t() const
 {
     return t_;
 }
 
 
-inline const Foam::tensor& Foam::vectorTensorTransform::R() const
+inline const Foam::tensor& Foam::transformer::R() const
 {
     return R_;
 }
 
 
-inline bool Foam::vectorTensorTransform::hasR() const
+inline bool Foam::transformer::hasR() const
 {
     return hasR_;
 }
 
 
-inline Foam::vector& Foam::vectorTensorTransform::t()
+inline Foam::vector& Foam::transformer::t()
 {
     return t_;
 }
 
 
-inline Foam::tensor& Foam::vectorTensorTransform::R()
+inline Foam::tensor& Foam::transformer::R()
 {
     // Assume that non-const access to R changes it from I, so set
     // hasR to true
@@ -99,7 +99,7 @@ inline Foam::tensor& Foam::vectorTensorTransform::R()
 }
 
 
-inline Foam::vector Foam::vectorTensorTransform::transformPosition
+inline Foam::vector Foam::transformer::transformPosition
 (
     const vector& v
 ) const
@@ -115,7 +115,7 @@ inline Foam::vector Foam::vectorTensorTransform::transformPosition
 }
 
 
-inline Foam::pointField Foam::vectorTensorTransform::transformPosition
+inline Foam::pointField Foam::transformer::transformPosition
 (
     const pointField& pts
 ) const
@@ -134,7 +134,7 @@ inline Foam::pointField Foam::vectorTensorTransform::transformPosition
 }
 
 
-inline Foam::vector Foam::vectorTensorTransform::invTransformPosition
+inline Foam::vector Foam::transformer::invTransformPosition
 (
     const vector& v
 ) const
@@ -150,7 +150,7 @@ inline Foam::vector Foam::vectorTensorTransform::invTransformPosition
 }
 
 
-inline Foam::pointField Foam::vectorTensorTransform::invTransformPosition
+inline Foam::pointField Foam::transformer::invTransformPosition
 (
     const pointField& pts
 ) const
@@ -171,9 +171,9 @@ inline Foam::pointField Foam::vectorTensorTransform::invTransformPosition
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline void Foam::vectorTensorTransform::operator&=
+inline void Foam::transformer::operator&=
 (
-    const vectorTensorTransform& tr
+    const transformer& tr
 )
 {
     t_ += tr.t_;
@@ -185,25 +185,25 @@ inline void Foam::vectorTensorTransform::operator&=
 }
 
 
-inline void Foam::vectorTensorTransform::operator=(const vector& t)
+inline void Foam::transformer::operator=(const vector& t)
 {
     t_ = t;
 }
 
 
-inline void Foam::vectorTensorTransform::operator+=(const vector& t)
+inline void Foam::transformer::operator+=(const vector& t)
 {
     t_ += t;
 }
 
 
-inline void Foam::vectorTensorTransform::operator-=(const vector& t)
+inline void Foam::transformer::operator-=(const vector& t)
 {
     t_ -= t;
 }
 
 
-inline void Foam::vectorTensorTransform::operator=(const tensor& R)
+inline void Foam::transformer::operator=(const tensor& R)
 {
     hasR_ = true;
 
@@ -211,7 +211,7 @@ inline void Foam::vectorTensorTransform::operator=(const tensor& R)
 }
 
 
-inline void Foam::vectorTensorTransform::operator&=(const tensor& R)
+inline void Foam::transformer::operator&=(const tensor& R)
 {
     hasR_ = true;
 
@@ -221,9 +221,9 @@ inline void Foam::vectorTensorTransform::operator&=(const tensor& R)
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-inline Foam::vectorTensorTransform Foam::inv(const vectorTensorTransform& tr)
+inline Foam::transformer Foam::inv(const transformer& tr)
 {
-    return vectorTensorTransform(-tr.t(), tr.R().T(), tr.hasR());
+    return transformer(-tr.t(), tr.R().T(), tr.hasR());
 }
 
 
@@ -231,8 +231,8 @@ inline Foam::vectorTensorTransform Foam::inv(const vectorTensorTransform& tr)
 
 inline bool Foam::operator==
 (
-    const vectorTensorTransform& tr1,
-    const vectorTensorTransform& tr2
+    const transformer& tr1,
+    const transformer& tr2
 )
 {
     return (tr1.t() == tr2.t() && tr1.R() == tr2.R());
@@ -241,51 +241,51 @@ inline bool Foam::operator==
 
 inline bool Foam::operator!=
 (
-    const vectorTensorTransform& tr1,
-    const vectorTensorTransform& tr2
+    const transformer& tr1,
+    const transformer& tr2
 )
 {
     return !operator==(tr1, tr2);
 }
 
 
-inline Foam::vectorTensorTransform Foam::operator+
+inline Foam::transformer Foam::operator+
 (
-    const vectorTensorTransform& tr,
+    const transformer& tr,
     const vector& t
 )
 {
-    return vectorTensorTransform(tr.t() + t, tr.R(), tr.hasR());
+    return transformer(tr.t() + t, tr.R(), tr.hasR());
 }
 
 
-inline Foam::vectorTensorTransform Foam::operator+
+inline Foam::transformer Foam::operator+
 (
     const vector& t,
-    const vectorTensorTransform& tr
+    const transformer& tr
 )
 {
-    return vectorTensorTransform(t + tr.t(), tr.R(), tr.hasR());
+    return transformer(t + tr.t(), tr.R(), tr.hasR());
 }
 
 
-inline Foam::vectorTensorTransform Foam::operator-
+inline Foam::transformer Foam::operator-
 (
-    const vectorTensorTransform& tr,
+    const transformer& tr,
     const vector& t
 )
 {
-    return vectorTensorTransform(tr.t() - t, tr.R(), tr.hasR());
+    return transformer(tr.t() - t, tr.R(), tr.hasR());
 }
 
 
-inline Foam::vectorTensorTransform Foam::operator&
+inline Foam::transformer Foam::operator&
 (
-    const vectorTensorTransform& tr1,
-    const vectorTensorTransform& tr2
+    const transformer& tr1,
+    const transformer& tr2
 )
 {
-    return vectorTensorTransform
+    return transformer
     (
         tr1.t() + tr2.t(),
         tr1.R() & tr2.R(),
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformTemplates.C b/src/OpenFOAM/primitives/transform/transformer/transformerTemplates.C
similarity index 85%
rename from src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformTemplates.C
rename to src/OpenFOAM/primitives/transform/transformer/transformerTemplates.C
index 7709ea133c..24f8adc58a 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformTemplates.C
+++ b/src/OpenFOAM/primitives/transform/transformer/transformerTemplates.C
@@ -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
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type Foam::vectorTensorTransform::transform(const Type& x) const
+Type Foam::transformer::transform(const Type& x) const
 {
     if (hasR_)
     {
@@ -40,7 +40,7 @@ Type Foam::vectorTensorTransform::transform(const Type& x) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::vectorTensorTransform::transform
+Foam::tmp<Foam::Field<Type>> Foam::transformer::transform
 (
     const Field<Type>& fld
 ) const
@@ -57,7 +57,7 @@ Foam::tmp<Foam::Field<Type>> Foam::vectorTensorTransform::transform
 
 
 template<class Type>
-Type Foam::vectorTensorTransform::invTransform(const Type& x) const
+Type Foam::transformer::invTransform(const Type& x) const
 {
     if (hasR_)
     {
@@ -71,7 +71,7 @@ Type Foam::vectorTensorTransform::invTransform(const Type& x) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::vectorTensorTransform::invTransform
+Foam::tmp<Foam::Field<Type>> Foam::transformer::invTransform
 (
     const Field<Type>& fld
 ) const
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.H
index b8214a54a7..5d5a2b6b28 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.H
@@ -96,9 +96,9 @@ public:
             }
 
             //- Return a reference to the AMI transformations
-            virtual const List<vectorTensorTransform>& AMITransforms() const
+            virtual const List<transformer>& AMITransforms() const
             {
-                const List<vectorTensorTransform>& AMITransforms =
+                const List<transformer>& AMITransforms =
                     cyclicAMIFvPatch::AMITransforms();
 
                 updateAreas();
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
index cca5a76a18..f390493fbb 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
@@ -128,7 +128,7 @@ public:
             }
 
             //- Return a reference to the AMI transforms
-            virtual const List<vectorTensorTransform>& AMITransforms() const
+            virtual const List<transformer>& AMITransforms() const
             {
                 return cyclicAMIPolyPatch_.AMITransforms();
             }
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 87ffe07fdc..7db0e78d39 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -186,7 +186,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
     {
         const labelPair& ciat = cellIAndTToExchange[bbI];
 
-        const vectorTensorTransform& transform = globalTransforms.transform
+        const transformer& transform = globalTransforms.transform
         (
             globalTransforms.transformIndex(ciat)
         );
@@ -403,7 +403,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
     {
         const labelPair& wfiat = wallFaceIAndTToExchange[bbI];
 
-        const vectorTensorTransform& transform = globalTransforms.transform
+        const transformer& transform = globalTransforms.transform
         (
             globalTransforms.transformIndex(wfiat)
         );
@@ -533,7 +533,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
 
         label wallFaceIndex = globalTransforms.index(wfiat);
 
-        const vectorTensorTransform& transform = globalTransforms.transform
+        const transformer& transform = globalTransforms.transform
         (
             globalTransforms.transformIndex(wfiat)
         );
@@ -700,7 +700,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
                             permutationIndices
                         );
 
-                        const vectorTensorTransform& transform =
+                        const transformer& transform =
                             globalTransforms.transform(transI);
 
                         treeBoundBox extendedReferredProcBb
@@ -747,7 +747,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
                         permutationIndices
                     );
 
-                    const vectorTensorTransform& transform =
+                    const transformer& transform =
                         globalTransforms.transform(transI);
 
                     treeBoundBox extendedReferredProcBb
@@ -790,7 +790,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
                     permutationIndices
                 );
 
-                const vectorTensorTransform& transform =
+                const transformer& transform =
                     globalTransforms.transform(transI);
 
                 treeBoundBox extendedReferredProcBb
@@ -958,7 +958,7 @@ void Foam::InteractionLists<ParticleType>::prepareParticleToBeReferred
     const globalIndexAndTransform& globalTransforms =
         mesh_.globalData().globalTransforms();
 
-    const vectorTensorTransform& transform = globalTransforms.transform
+    const transformer& transform = globalTransforms.transform
     (
         globalTransforms.transformIndex(ciat)
     );
@@ -1008,7 +1008,7 @@ void Foam::InteractionLists<ParticleType>::prepareWallDataToRefer()
 
         label wallFaceIndex = globalTransforms.index(wfiat);
 
-        const vectorTensorTransform& transform = globalTransforms.transform
+        const transformer& transform = globalTransforms.transform
         (
             globalTransforms.transformIndex(wfiat)
         );
diff --git a/src/lagrangian/basic/particle/particle.C b/src/lagrangian/basic/particle/particle.C
index 7f1d975bdc..086c20baa7 100644
--- a/src/lagrangian/basic/particle/particle.C
+++ b/src/lagrangian/basic/particle/particle.C
@@ -1097,7 +1097,7 @@ void Foam::particle::correctAfterParallelTransfer
 
 void Foam::particle::prepareForInteractionListReferral
 (
-    const vectorTensorTransform& transform
+    const transformer& transform
 )
 {
     // Get the transformed position
diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H
index d765f08018..b96ec59e9f 100644
--- a/src/lagrangian/basic/particle/particle.H
+++ b/src/lagrangian/basic/particle/particle.H
@@ -44,7 +44,7 @@ Description
 #include "FixedList.H"
 #include "polyMeshTetDecomposition.H"
 #include "particleMacros.H"
-#include "vectorTensorTransform.H"
+#include "transformer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -648,7 +648,7 @@ public:
         //  particle can be referred.
         void prepareForInteractionListReferral
         (
-            const vectorTensorTransform& transform
+            const transformer& transform
         );
 
         //- Correct the topology after referral. The particle may still be
diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C
index ac0ccd8de2..4cdb5d1510 100644
--- a/src/lagrangian/basic/particle/particleTemplates.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -359,7 +359,7 @@ void Foam::particle::hitCyclicAMIPatch
     // Transform the properties
     vector displacementT = displacement;
 
-    const vectorTensorTransform AMITransform =
+    const transformer AMITransform =
         receiveCpp.owner()
       ? receiveCpp.AMITransforms()[receiveAMIi]
       : inv(cpp.AMITransforms()[receiveAMIi]);
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
index b0c547705e..f1f7e9977a 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
@@ -62,7 +62,7 @@ class cyclicAMIGAMGInterface
         PtrList<AMIInterpolation> AMIs_;
 
         //- AMI transformations
-        List<vectorTensorTransform> AMITransforms_;
+        List<transformer> AMITransforms_;
 
 
 public:
@@ -136,7 +136,7 @@ public:
             }
 
             // Return a reference to the AMI transformations
-            virtual const List<vectorTensorTransform>& AMITransforms() const
+            virtual const List<transformer>& AMITransforms() const
             {
                 return AMITransforms_;
             }
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.H
index 2feb8a2e49..18f1a95f1c 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.H
@@ -84,7 +84,7 @@ public:
             virtual const PtrList<AMIInterpolation>& AMIs() const = 0;
 
             // Return a reference to the AMI transformations
-            virtual const List<vectorTensorTransform>&
+            virtual const List<transformer>&
                 AMITransforms() const = 0;
 
             //- Return face transformation tensor
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index 853b05e98c..cb28157893 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -340,7 +340,7 @@ void Foam::cyclicAMIPolyPatch::resetAMI() const
             )
         );
 
-        AMITransforms_.resize(1, vectorTensorTransform::I);
+        AMITransforms_.resize(1, transformer::I);
 
         if (debug)
         {
@@ -818,7 +818,7 @@ Foam::cyclicAMIPolyPatch::AMIs() const
 }
 
 
-const Foam::List<Foam::vectorTensorTransform>&
+const Foam::List<Foam::transformer>&
 Foam::cyclicAMIPolyPatch::AMITransforms() const
 {
     if (!owner())
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
index 18dd4e2bd2..904a98480e 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.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
@@ -109,7 +109,7 @@ protected:
         mutable PtrList<AMIInterpolation> AMIs_;
 
         //- AMI transforms (from source to target)
-        mutable List<vectorTensorTransform> AMITransforms_;
+        mutable List<transformer> AMITransforms_;
 
         //- Flag to indicate that slave patch should be reversed for AMI
         const bool AMIReverse_;
@@ -310,7 +310,7 @@ public:
             const PtrList<AMIInterpolation>& AMIs() const;
 
             //- Return a reference to the AMI transforms
-            const List<vectorTensorTransform>& AMITransforms() const;
+            const List<transformer>& AMITransforms() const;
 
             //- Return true if applying the low weight correction
             bool applyLowWeightCorrection() const;
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicRepeatAMI/cyclicRepeatAMIPolyPatch/cyclicRepeatAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicRepeatAMI/cyclicRepeatAMIPolyPatch/cyclicRepeatAMIPolyPatch.C
index dab9479fc4..ca45102c21 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicRepeatAMI/cyclicRepeatAMIPolyPatch/cyclicRepeatAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicRepeatAMI/cyclicRepeatAMIPolyPatch/cyclicRepeatAMIPolyPatch.C
@@ -87,7 +87,7 @@ void Foam::cyclicRepeatAMIPolyPatch::resetAMI() const
         << endl;
 
     // Get the transform associated with the transform patch
-    vectorTensorTransform t;
+    transformer t;
     {
         const coupledPolyPatch& transformPatch = this->transformPatch();
 
@@ -100,10 +100,10 @@ void Foam::cyclicRepeatAMIPolyPatch::resetAMI() const
                 << "This is not allowed." << exit(FatalError);
         }
 
-        Tuple2<bool, vectorTensorTransform> bt
+        Tuple2<bool, transformer> bt
         (
             transformPatch.size(),
-            vectorTensorTransform
+            transformer
             (
                 transformPatch.separated()
               ? transformPatch.separation()
@@ -115,7 +115,7 @@ void Foam::cyclicRepeatAMIPolyPatch::resetAMI() const
             )
         );
 
-        reduce(bt, keepIfTrueOp<vectorTensorTransform>());
+        reduce(bt, keepIfTrueOp<transformer>());
 
         if (!bt.first())
         {
@@ -130,7 +130,7 @@ void Foam::cyclicRepeatAMIPolyPatch::resetAMI() const
 
         t = bt.second();
     }
-    const vectorTensorTransform tInv(inv(t));
+    const transformer tInv(inv(t));
 
     // Work out the number of repetitions of the transform that separate this
     // patch from its neighbour
@@ -172,7 +172,7 @@ void Foam::cyclicRepeatAMIPolyPatch::resetAMI() const
     }
 
     // Generate the full transformations
-    vectorTensorTransform TLeft(t), T(vectorTensorTransform::I), TRight(tInv);
+    transformer TLeft(t), T(transformer::I), TRight(tInv);
     if (n > 0)
     {
         for (label i = 0; i < n - 1; ++ i)
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index 9d130149fe..d5a6a3c728 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -472,7 +472,7 @@ void Foam::FaceCellWave<Type, TrackingData>::transform
 template<class Type, class TrackingData>
 void Foam::FaceCellWave<Type, TrackingData>::transform
 (
-    const vectorTensorTransform& trans,
+    const transformer& trans,
     const label nFaces,
     List<Type>& faceInfo
 )
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.H b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
index 5ea9e85f44..052aceadfb 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.H
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
@@ -60,7 +60,7 @@ namespace Foam
 // Forward declaration of classes
 class polyMesh;
 class polyPatch;
-class vectorTensorTransform;
+class transformer;
 
 /*---------------------------------------------------------------------------*\
                         Class FaceCellWaveName Declaration
@@ -223,7 +223,7 @@ protected:
             //- Apply transformation to Type
             void transform
             (
-                const vectorTensorTransform& trans,
+                const transformer& trans,
                 const label nFaces,
                 List<Type>& faceInfo
             );
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
index da31310b54..f8a2320235 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
@@ -40,7 +40,7 @@ SourceFiles
 #include "scalarField.H"
 #include "PackedBoolList.H"
 #include "PrimitivePatch.H"
-#include "vectorTensorTransform.H"
+#include "transformer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -333,7 +333,7 @@ public:
 
     void operator()
     (
-        const vectorTensorTransform& vt,
+        const transformer& vt,
         const bool forward,
         List<Type>& fld
     ) const