diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
index 8f65cab102cf5831c6a33ce37e0f4ba566d0e27a..feb3d898bc2f3a5e878a15f5cdcaae51e5436c4b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
@@ -19,7 +19,7 @@ actions
 (
     // Heater
     {
-        name    heater;
+        name    heaterCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -29,7 +29,7 @@ actions
         }
     }
     {
-        name    heater;
+        name    heaterCellSet;
         type    cellSet;
         action  add;
         source  boxToCell;
@@ -45,13 +45,13 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set heater;           // name of cellSet
+            set heaterCellSet;
         }
     }
 
     // leftSolid
     {
-        name    leftSolid;
+        name    leftSolidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -67,13 +67,13 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set leftSolid;
+            set leftSolidCellSet;
         }
     }
 
     // rightSolid
     {
-        name    rightSolid;
+        name    rightSolidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -89,13 +89,13 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set rightSolid;
+            set rightSolidCellSet;
         }
     }
 
     // topAir
     {
-        name    topAir;
+        name    topAirCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -111,59 +111,54 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set topAir;
+            set topAirCellSet;
         }
     }
 
 
     // bottomWater is all the other cells
     {
-        name    bottomWater;
-        type    cellZoneSet;
-        action  clear;
-    }
-    {
-        name    bottomWater;
+        name    bottomWaterCellSet;
         type    cellSet;
-        action  add;
+        action  new;
         source  cellToCell;
         sourceInfo
         {
-            set heater;
+            set heaterCellSet;
         }
     }
     {
-        name    bottomWater;
+        name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
         sourceInfo
         {
-            set leftSolid;
+            set leftSolidCellSet;
         }
     }
     {
-        name    bottomWater;
+        name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
         sourceInfo
         {
-            set rightSolid;
+            set rightSolidCellSet;
         }
     }
     {
-        name    bottomWater;
+        name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
         sourceInfo
         {
-            set topAir;
+            set topAirCellSet;
         }
     }
     {
-        name    bottomWater;
+        name    bottomWaterCellSet;
         type    cellSet;
         action  invert;
     }
@@ -174,9 +169,10 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set bottomWater;
+            set bottomWaterCellSet;
         }
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
index 36dc18f95f2eee79c3e4386020564b18cde51344..9d58910e8ec34c64d314be6e7d1c96f423b4903b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
@@ -95,7 +95,7 @@ actions
     }
 
     {
-        name    rotorBlades;
+        name    rotorBladesFaceSet;
         type    faceSet;
         action  add;
         source  faceToFace;
@@ -111,7 +111,7 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet rotorBlades;
+            faceSet rotorBladesFaceSet;
         }
     }
 );
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
index bd14f41a4413e5f81b2602609390017c668be423..dc7c09c0a4ca01e131164c87fbf109744542bd23 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
@@ -19,7 +19,7 @@ actions
 (
     // Heater
     {
-        name    heater;
+        name    heaterCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -29,7 +29,7 @@ actions
         }
     }
     {
-        name    heater;
+        name    heaterCellSet;
         type    cellSet;
         action  add;
         source  boxToCell;
@@ -45,13 +45,13 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set heater;           // name of cellSet
+            set heaterCellSet;
         }
     }
 
     // leftSolid
     {
-        name    leftSolid;
+        name    leftSolidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -67,13 +67,13 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set leftSolid;
+            set leftSolidCellSet;
         }
     }
 
     // rightSolid
     {
-        name    rightSolid;
+        name    rightSolidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -89,13 +89,13 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set rightSolid;
+            set rightSolidCellSet;
         }
     }
 
     // topAir
     {
-        name    topAir;
+        name    topAirCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -111,59 +111,54 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set topAir;
+            set topAirCellSet;
         }
     }
 
 
     // bottomAir is all the other cells
     {
-        name    bottomAir;
-        type    cellZoneSet;
-        action  clear;
-    }
-    {
-        name    bottomAir;
+        name    bottomAirCellSet;
         type    cellSet;
-        action  add;
+        action  new;
         source  cellToCell;
         sourceInfo
         {
-            set heater;
+            set heaterCellSet;
         }
     }
     {
-        name    bottomAir;
+        name    bottomAirCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
         sourceInfo
         {
-            set leftSolid;
+            set leftSolidCellSet;
         }
     }
     {
-        name    bottomAir;
+        name    bottomAirCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
         sourceInfo
         {
-            set rightSolid;
+            set rightSolidCellSet;
         }
     }
     {
-        name    bottomAir;
+        name    bottomAirCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
         sourceInfo
         {
-            set topAir;
+            set topAirCellSet;
         }
     }
     {
-        name    bottomAir;
+        name    bottomAirCellSet;
         type    cellSet;
         action  invert;
     }
@@ -174,9 +169,10 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set bottomAir;
+            set bottomAirCellSet;
         }
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict
index 814bded7d0ac8c538056e65c606400931ef43b40..31a334f325f5784db487e3da953775fcf16c8999 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict
@@ -21,7 +21,7 @@ actions
 
     // Create faceZone for patch couple1
     {
-        name    couple1Faces;
+        name    couple1FaceSet;
         type    faceSet;
         action  new;
         source  patchToFace;
@@ -37,13 +37,13 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet couple1Faces;
+            faceSet couple1FaceSet;
         }
     }
 
     // Create faceZone for patch couple2
     {
-        name    couple2Faces;
+        name    couple2FaceSet;
         type    faceSet;
         action  new;
         source  patchToFace;
@@ -59,13 +59,13 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet couple2Faces;
+            faceSet couple2FaceSet;
         }
     }
 
     // Create cellZone for moving cells in inlet channel
     {
-        name    inletChannel;
+        name    inletChannelCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -81,7 +81,7 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set     inletChannel;
+            set     inletChannelCellSet;
         }
     }
 );
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
index f5a6dadaeecebbfba7734809a7ef7bf9e1c57569..579d2161faa0d63bffaebcd550658e1bf4dab25d 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
@@ -18,7 +18,7 @@ FoamFile
 actions
 (
     {
-        name    cyclicFaces;
+        name    cyclicFacesFaceSet;
         type    faceSet;
         action  new;
         source  boxToFace;
@@ -46,13 +46,13 @@ actions
         source  setsToFaceZone;
         sourceInfo
         {
-            faceSet cyclicFaces;
+            faceSet cyclicFacesFaceSet;
             cellSet cyclicFacesSlaveCells;
         }
     }
 
     {
-        name    baffleFaces;
+        name    baffleFaceSet;
         type    faceSet;
         action  new;
         source  boxToFace;
@@ -63,7 +63,7 @@ actions
     }
 
     {
-        name    baffleFaces;
+        name    baffleFaceSet;
         type    faceSet;
         action  delete;
         source  boxToFace;
@@ -80,7 +80,7 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet baffleFaces;
+            faceSet baffleFaceSet;
         }
     }
 );
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
index 7d109863eefb6dde4ef3223ca1a7b72dcb04b638..665171df46c1ebeecb1a3982f715d054289367fa 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
@@ -19,7 +19,7 @@ actions
 (
     // actuationDisk1
     {
-        name    actuationDisk1;
+        name    actuationDisk1CellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -35,13 +35,13 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set actuationDisk1;
+            set actuationDisk1CellSet;
         }
     }
 
     // actuationDisk2
     {
-        name    actuationDisk2;
+        name    actuationDisk2CellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -57,7 +57,7 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set actuationDisk2;
+            set actuationDisk2CellSet;
         }
     }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/topoSetDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/topoSetDict
index f29cde9eb11fb3265e7b5b24a3ebddd21cf1e72d..94c4fcb707f301287eef378d99cf23a2a1779b40 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/topoSetDict
@@ -18,7 +18,7 @@ FoamFile
 actions
 (
     {
-        name    wallFilmFaces;
+        name    wallFilmFaceSet;
         type    faceSet;
         action  new;
         source  patchToFace;
@@ -34,7 +34,7 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet wallFilmFaces;
+            faceSet wallFilmFaceSet;
         }
     }
 );
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet
index f29cde9eb11fb3265e7b5b24a3ebddd21cf1e72d..72ed9e455c1c1037d230575a49483c5bd38c9028 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet
@@ -18,7 +18,7 @@ FoamFile
 actions
 (
     {
-        name    wallFilmFaces;
+        name    wallFilmFaceSet;
         type    faceSet;
         action  new;
         source  patchToFace;
@@ -34,9 +34,10 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet wallFilmFaces;
+            faceSet wallFilmFaceSet;
         }
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet
index f29cde9eb11fb3265e7b5b24a3ebddd21cf1e72d..94c4fcb707f301287eef378d99cf23a2a1779b40 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet
@@ -18,7 +18,7 @@ FoamFile
 actions
 (
     {
-        name    wallFilmFaces;
+        name    wallFilmFaceSet;
         type    faceSet;
         action  new;
         source  patchToFace;
@@ -34,7 +34,7 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet wallFilmFaces;
+            faceSet wallFilmFaceSet;
         }
     }
 );
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
index e77e55346fbcf1e14d984de620a9201db022246c..748dbafce7e7a331c603f39e8fd9ebae5e8b72f7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
@@ -19,7 +19,7 @@ actions
 (
     // filter
     {
-        name    filter;
+        name    filterCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -35,13 +35,13 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set filter;
+            set filterCellSet;
         }
     }
 
 
     {
-        name    leftFluid;
+        name    leftFluidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -57,11 +57,11 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set leftFluid;
+            set leftFluidCellSet;
         }
     }
     {
-        name    rightFluid;
+        name    rightFluidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
@@ -77,31 +77,31 @@ actions
         source  setToCellZone;
         sourceInfo
         {
-            set rightFluid;
+            set rightFluidCellSet;
         }
     }
 
 
     // cycLeft
     {
-        name    cycLeft;
+        name    cycLeftFaceSet;
         type    faceSet;
         action  new;
         source  cellToFace;
         sourceInfo
         {
-            set     filter;
+            set     filterCellSet;
             option  all;
         }
     }
     {
-        name    cycLeft;
+        name    cycLeftFaceSet;
         type    faceSet;
         action  subset;
         source  cellToFace;
         sourceInfo
         {
-            set     leftFluid;
+            set     leftFluidCellSet;
             option  all;
         }
     }
@@ -113,30 +113,30 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet cycLeft;    // name of faceSet
+            faceSet cycLeftFaceSet;
         }
     }
 
     // cycRight
     {
-        name    cycRight;
+        name    cycRightFaceSet;
         type    faceSet;
         action  new;
         source  cellToFace;
         sourceInfo
         {
-            set     filter;
+            set     filterCellSet;
             option  all;
         }
     }
     {
-        name    cycRight;
+        name    cycRightFaceSet;
         type    faceSet;
         action  subset;
         source  cellToFace;
         sourceInfo
         {
-            set     rightFluid;
+            set     rightFluidCellSet;
             option  all;
         }
     }
@@ -148,10 +148,10 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet cycRight;   // name of faceSet
+            faceSet cycRightFaceSet;
         }
     }
-
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
index 2bb3f8b6a4ab8635c9f363e96cb1ef9f86f4271b..991ecb0dbef0ffa866e717bca54f19f6a2bb1c32 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
@@ -18,7 +18,7 @@ FoamFile
 actions
 (
     {
-        name    cyclicFaces;
+        name    cyclicFacesFaceSet;
         type    faceSet;
         action  new;
         source  boxToFace;
@@ -46,7 +46,7 @@ actions
         source  setsToFaceZone;
         sourceInfo
         {
-            faceSet cyclicFaces;
+            faceSet cyclicFacesFaceSet;
             cellSet cyclicFacesSlaveCells;
         }
     }
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
index 247344a8771fee13e0f57b1613141b9c42015491..6bcf028ed47ce8e3e41869d9cebc9b1728712249 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
@@ -35,7 +35,7 @@ actions
     }
 
     {
-        name    f0;
+        name    f0FaceSet;
         type    faceSet;
         action  new;
         source  patchToFace;
@@ -46,7 +46,7 @@ actions
     }
 
     {
-        name    f0;
+        name    f0FaceSet;
         type    faceSet;
         action  subset;
         source  boxToFace;
@@ -63,9 +63,10 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet    f0;
+            faceSet    f0FaceSet;
         }
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
index 247344a8771fee13e0f57b1613141b9c42015491..6bcf028ed47ce8e3e41869d9cebc9b1728712249 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
@@ -35,7 +35,7 @@ actions
     }
 
     {
-        name    f0;
+        name    f0FaceSet;
         type    faceSet;
         action  new;
         source  patchToFace;
@@ -46,7 +46,7 @@ actions
     }
 
     {
-        name    f0;
+        name    f0FaceSet;
         type    faceSet;
         action  subset;
         source  boxToFace;
@@ -63,9 +63,10 @@ actions
         source  setToFaceZone;
         sourceInfo
         {
-            faceSet    f0;
+            faceSet    f0FaceSet;
         }
     }
 );
 
+
 // ************************************************************************* //