diff --git a/etc/caseDicts/mesh/manipulation/AMI/createBafflesDict b/etc/caseDicts/mesh/manipulation/AMI/createBafflesDict
index fa65dfbff0..03f2cc99a8 100644
--- a/etc/caseDicts/mesh/manipulation/AMI/createBafflesDict
+++ b/etc/caseDicts/mesh/manipulation/AMI/createBafflesDict
@@ -28,13 +28,13 @@ baffles
             {
                 name            AMI1;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI2;
             }
             slave
             {
                 $master;
                 name            AMI2;
+                type            cyclicAMI;
                 neighbourPatch  AMI1;
             }
         }
diff --git a/etc/templates/closedVolumeRotating/system/createBafflesDict b/etc/templates/closedVolumeRotating/system/createBafflesDict
index 86d4e99582..b207bc3cf8 100644
--- a/etc/templates/closedVolumeRotating/system/createBafflesDict
+++ b/etc/templates/closedVolumeRotating/system/createBafflesDict
@@ -30,13 +30,13 @@ baffles
             {
                 name            AMI1;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI2;
             }
             slave
             {
                 $master;
                 name            AMI2;
+                type            cyclicAMI;
                 neighbourPatch  AMI1;
             }
         }
diff --git a/etc/templates/inflowOutflowRotating/system/createBafflesDict b/etc/templates/inflowOutflowRotating/system/createBafflesDict
index 86d4e99582..7e5e4d275b 100644
--- a/etc/templates/inflowOutflowRotating/system/createBafflesDict
+++ b/etc/templates/inflowOutflowRotating/system/createBafflesDict
@@ -30,13 +30,12 @@ baffles
             {
                 name            AMI1;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI2;
             }
             slave
             {
-                $master;
                 name            AMI2;
+                type            cyclicAMI;
                 neighbourPatch  AMI1;
             }
         }
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
index fa65dfbff0..cd29dfdef8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
@@ -28,7 +28,6 @@ baffles
             {
                 name            AMI1;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI2;
             }
             slave
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict
index 7627291fd8..b06202642b 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict
@@ -38,7 +38,6 @@ baffles
                 //- Master side patch
                 name            ACMI1_couple;
                 type            cyclicACMI;
-                matchTolerance  0.0001;
                 neighbourPatch  ACMI2_couple;
                 nonOverlapPatch ACMI1_blockage;
             }
@@ -77,7 +76,6 @@ baffles
                 //- Master side patch
                 name            ACMI2_couple;
                 type            cyclicACMI;
-                matchTolerance  0.0001;
                 neighbourPatch  ACMI1_couple;
                 nonOverlapPatch ACMI2_blockage;
             }
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
index c308f5de08..575cf8cd79 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
@@ -33,7 +33,6 @@ baffles
             {
                 name            AMI1;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI2;
             }
             slave
diff --git a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict
index c308f5de08..575cf8cd79 100644
--- a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict
+++ b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict
@@ -33,7 +33,6 @@ baffles
             {
                 name            AMI1;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI2;
             }
             slave
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
index 7fce545ba5..62a77a80cf 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
@@ -35,7 +35,6 @@ baffles
                 //- Master side patch
                 name            AMI1;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI2;
             }
 
@@ -44,7 +43,6 @@ baffles
                 //- Slave side patch
                 name            AMI2;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI1;
             }
         }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
index c308f5de08..575cf8cd79 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
@@ -33,7 +33,6 @@ baffles
             {
                 name            AMI1;
                 type            cyclicAMI;
-                matchTolerance  0.0001;
                 neighbourPatch  AMI2;
             }
             slave