diff --git a/etc/caseDicts/annotated/createPatchDict b/etc/caseDicts/annotated/createPatchDict
index 9a9bc278cd..786ab2745b 100644
--- a/etc/caseDicts/annotated/createPatchDict
+++ b/etc/caseDicts/annotated/createPatchDict
@@ -62,10 +62,10 @@ patches
 
             // Optional: explicitly set transformation tensor.
             // Used when matching and synchronising points.
-            transform rotational;
+            transformType rotational;
             rotationAxis (1 0 0);
             rotationCentre (0 0 0);
-            // transform translational;
+            // transformType translational;
             // separation (1 0 0);
 
             // Optional non-default tolerance to be able to define cyclics
@@ -94,10 +94,10 @@ patches
 
             // Optional: explicitly set transformation tensor.
             // Used when matching and synchronising points.
-            transform rotational;
+            transformType rotational;
             rotationAxis (1 0 0);
             rotationCentre (0 0 0);
-            // transform translational;
+            // transformType translational;
             // separation (1 0 0);
         }
 
diff --git a/etc/caseDicts/mesh/manipulation/AMI/createBafflesDict b/etc/caseDicts/mesh/manipulation/AMI/createBafflesDict
index 9372c2c628..c456adb553 100644
--- a/etc/caseDicts/mesh/manipulation/AMI/createBafflesDict
+++ b/etc/caseDicts/mesh/manipulation/AMI/createBafflesDict
@@ -31,7 +31,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
-                transform       noOrdering;
             }
             slave
             {
diff --git a/etc/caseDicts/mesh/manipulation/AMI/createPatchDict b/etc/caseDicts/mesh/manipulation/AMI/createPatchDict
index 3c176eb058..3ec2fb1167 100644
--- a/etc/caseDicts/mesh/manipulation/AMI/createPatchDict
+++ b/etc/caseDicts/mesh/manipulation/AMI/createPatchDict
@@ -27,7 +27,6 @@ masterAMI
         type            cyclicAMI;
         matchTolerance  0.0001;
         neighbourPatch  AMI2;
-        transform       noOrdering;
     }
     constructFrom patches;
     patches (cylinder);
diff --git a/etc/templates/closedVolumeRotating/system/createBafflesDict b/etc/templates/closedVolumeRotating/system/createBafflesDict
index 351029ca5d..a9134c7067 100644
--- a/etc/templates/closedVolumeRotating/system/createBafflesDict
+++ b/etc/templates/closedVolumeRotating/system/createBafflesDict
@@ -33,7 +33,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
-                transform       noOrdering;
             }
             slave
             {
diff --git a/etc/templates/inflowOutflowRotating/system/createBafflesDict b/etc/templates/inflowOutflowRotating/system/createBafflesDict
index d0975ad234..a9134c7067 100644
--- a/etc/templates/inflowOutflowRotating/system/createBafflesDict
+++ b/etc/templates/inflowOutflowRotating/system/createBafflesDict
@@ -33,7 +33,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
-                transform       none;
             }
             slave
             {
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
index 99310c48c4..c456adb553 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
@@ -31,7 +31,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
-                ordering        noOrdering;
             }
             slave
             {
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/README b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/README
index cf93ebe1d4..5d92207159 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/README
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/README
@@ -16,7 +16,6 @@ from the constant/polyMesh/boundary file:
             nFaces          40;
             startFace       43720;
             matchTolerance  0.0001;
-            ordering        noOrdering;
             neighbourPatch  ACMI2_couple;
             nonOverlapPatch ACMI1_blockage;
         }
@@ -36,7 +35,6 @@ from the constant/polyMesh/boundary file:
             nFaces          96;
             startFace       43856;
             matchTolerance  0.0001;
-            ordering        noOrdering;
             neighbourPatch  ACMI1_couple;
             nonOverlapPatch ACMI2_blockage;
         }
@@ -77,7 +75,6 @@ patches) the slave patches are simply defined using 'dummy' entries, e.g.:
             matchTolerance  0.0001;
             neighbourPatch  ACMI2_couple;
             nonOverlapPatch ACMI1_blockage;
-            ordering        noOrdering;
         }
         slave // dummy entries only
         {
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict
index b7176cea72..e782ff5a04 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict
@@ -42,7 +42,6 @@ baffles
                 matchTolerance  0.0001;
                 neighbourPatch  ACMI2_couple;
                 nonOverlapPatch ACMI1_blockage;
-                ordering        noOrdering;
             }
             slave // not used since we're manipulating a boundary patch
             {
@@ -82,7 +81,6 @@ baffles
                 matchTolerance  0.0001;
                 neighbourPatch  ACMI1_couple;
                 nonOverlapPatch ACMI2_blockage;
-                ordering        noOrdering;
             }
             slave // not used since we're manipulating a boundary patch
             {
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
index 1d13f7dff0..34dce48082 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
@@ -36,7 +36,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
-                transform       none;
             }
             slave
             {
diff --git a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict
index 1d13f7dff0..34dce48082 100644
--- a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict
+++ b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict
@@ -36,7 +36,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
-                transform       none;
             }
             slave
             {
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
index ceefc5fd6c..70e010e56f 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
@@ -38,7 +38,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
-                ordering        noOrdering;
             }
 
             slave
@@ -48,7 +47,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI1;
-                ordering        noOrdering;
             }
         }
     }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
index 1d13f7dff0..34dce48082 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
@@ -36,7 +36,6 @@ baffles
                 type            cyclicAMI;
                 matchTolerance  0.0001;
                 neighbourPatch  AMI2;
-                transform       none;
             }
             slave
             {