diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut
index d4e02be73400b09ee7e6a8c9d0f44e7fb2411a41..716017395360b49dfcb4d6dedb43019db9a12e68 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
index 014405cadb66b5c30215f7daae9766d05aedc94e..c95de4480e188473f8ede3d1209642d3133196a7 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0/pyrolysisRegion";
-    object      Ychar;
+    object      char;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
index 7de75799a36aea272abed45a22091c8d66ef7f52..d7ac08a6d71798eb5b8b1c174e14d1183d060c9b 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -11,7 +11,7 @@ FoamFile
     format      binary;
     class       dictionary;
     location    "constant";
-    object      pyrolysisProperties;
+    object      pyrolysisZones;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/H2O b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/H2O
index e56f20fb80da263f1878804bb7e43096c1e940bf..a15d6af41100e09454e2b8e3994256e2553e2765 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/H2O
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/H2O
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      H2;
+    object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/nut b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/nut
index 1cd5c32cdf2d45c018f875e76c4291939ba8bbbf..52bb299b61b109fee8a67e7df4301c376e32d965 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/nut
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/nut
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/H2O b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/H2O
index 1ebe0ef8b77efc0988049f175f8e2c9abead10ed..bd6ef6ea6a9097363649969d5bb53fdf8bc098ba 100644
--- a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/H2O
+++ b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/H2O
@@ -11,8 +11,9 @@ FoamFile
     format          ascii;
     class           volScalarField;
     location        "0";
-    object          H2;
+    object          H2O;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 0 0 0 0 0 0 ];
 
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx
index ff16ba9bb9bacafd86e3ad1dc3f04c331f68f309..b8802196684fbda9aae3a2241f729075ab1fa042 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       pointScalarField;
-    object      pointMotionU;
+    object      pointMotionUx;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0/nut
index ce47ddb5f7724799b49da39ba75e15cf7a637a4f..e1a2b9c76771b2d0e3aef3e5ff2fe45dbdfb81da 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0/nut
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict
index ed8c66eeed30cf1fd8e3f85d7c25d3e7534b8b94..b8a731dfbe7230a2b8a35b3a12e2a836b472e779 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      extrudeProperties;
+    object      extrudeMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions
index 48e2e8e07cd63a70f8bba97d49a39e4e8858555b..302e78b13690a7acc75a30a407c786b873b01928 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      porousZone;
+    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings
index 76fb68fa877987f6bf73063de31fe41948741e97..a6adddb3eb49eb07ed33fb88ed2e62c15c098483 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings
@@ -10,8 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "";
-    object      caseSummary;
+    location    "constant";
+    object      caseSettings;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0/nut b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0/nut
index ce47ddb5f7724799b49da39ba75e15cf7a637a4f..e1a2b9c76771b2d0e3aef3e5ff2fe45dbdfb81da 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0/nut
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0/nut
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict
index ed8c66eeed30cf1fd8e3f85d7c25d3e7534b8b94..b8a731dfbe7230a2b8a35b3a12e2a836b472e779 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      extrudeProperties;
+    object      extrudeMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvOptions b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvOptions
index 48e2e8e07cd63a70f8bba97d49a39e4e8858555b..302e78b13690a7acc75a30a407c786b873b01928 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvOptions
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvOptions
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      porousZone;
+    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx b/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
index ff16ba9bb9bacafd86e3ad1dc3f04c331f68f309..b8802196684fbda9aae3a2241f729075ab1fa042 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       pointScalarField;
-    object      pointMotionU;
+    object      pointMotionUx;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
index 5885cbd6ab150a6a96ae8acdde57324a93e93b1d..e0548316dee7f26e8e63a5d443f8b74353b048ce 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
@@ -10,9 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      molConfigDict;
+    object      mdInitialiseDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Euler angles, expressed in degrees as phi, theta, psi, see
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
index 5c01f985bf57127b256a3ce38093128b2e06857a..7d6aaa1ab9b03fd5cfcd8057e1a4269044d89bd7 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      potentials;
+    object      potentialDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
index 55d5c668b5475b3cb80f30027ec33a6239eb2c29..dfcc625835699970b47eb50037f9858cd1edb5ad 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      molConfigDict;
+    object      mdInitialiseDict;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
index 1baa7ef3838458c33d861bbc6ca39aac8acb8b52..53e4ba1665fd7e18f96a2a845530b12f29df8a6c 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      potentials;
+    object      potentialDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
index 5bfc36fd3843e2e250a9a54a061c60048c87fcb2..3f04a5aded0baeb18a0c709c6ede2f491e6063c7 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      molConfigDict;
+    object      mdInitialiseDict;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
index 1baa7ef3838458c33d861bbc6ca39aac8acb8b52..53e4ba1665fd7e18f96a2a845530b12f29df8a6c 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      potentials;
+    object      potentialDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
index 18ed727d32c4f8a1baab55bff48ceb4294af358c..496e3ca4f08ce5cb36185309d586cf72d98b82aa 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
index 8113518c3018986ab6de7ae49dd67eacb2956503..438aa0051b5847979256bf80e33f346c2e349a5c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
index 21379f0c0cbacfdc201bfece2eb122d7bc3cd382..2be0cd10376eccf2280c8e3ed013e816f83e8766 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
index 21379f0c0cbacfdc201bfece2eb122d7bc3cd382..2be0cd10376eccf2280c8e3ed013e816f83e8766 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0/gas/nut b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0/gas/nut
index dbb611c28f36e62be486568507444a553e907d3f..8fa43ee87824d263bf349fa10c2faeda9552ed67 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0/gas/nut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0/gas/nut
@@ -11,7 +11,7 @@ FoamFile
     format      binary;
     class       volScalarField;
     location    "0/gas";
-    object      nutt;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh
index 2476c4c92026d0024ea156cd1e15f99ee57190ca..5ccdae269bbfccf38e0994b3e8081400b27159be 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      p;
+    object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
index 21379f0c0cbacfdc201bfece2eb122d7bc3cd382..2be0cd10376eccf2280c8e3ed013e816f83e8766 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/omega b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/omega
index 20e3b3a72e5ac30fb9fe81ec1649da0ee18918ae..abbceb8de8950320c2de5455c41fa2b7189aeb2d 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/omega
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/omega
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      epsilon;
+    object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/turbulenceProperties
index 152018ed959256c52844f0603d39f4f1395497d1..45dd798309a3fffe9b8f7cefec0f30291a8fe567 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/turbulenceProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T
index ab527c9b170f88c16c0488b3ad4264c00b4dc343..c71c101c064d9c2b12e550f244661de1b273bf60 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      s;
+    object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega
index ebed555eafcfc29b6d07c19d58fd230f2b94c93b..d0dc78cb5e878af52da1f605c79ff683f182224e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      epsilon;
+    object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx
index 047ec1e53b95fb4ec6dc8d86dded54f99fa5d727..d8bce6921cad88f9bf234f7134dd0388aceea9e5 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       pointScalarField;
-    object      pointMotionU;
+    object      pointMotionUx;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
index 0f019915d5bbe87e0167810f45896ea1870177cc..ff2d9ae925092a0a66b2d6d1567bebe423341e59 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volSymmTensorField;
-    object      R;
+    object      sigma;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/sigma b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/sigma
index 8d39df3602aca126984e492035069a1458215e00..d43b3e65726a6635dc0445653b8f24dcc88547f9 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/sigma
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/sigma
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volSymmTensorField;
-    object      R;
+    object      sigma;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties
index e97db2746ca15870f209dfe739809ac00b3747a0..3c228f7bbfbae61aefd277392b93e9f5b9b47f7b 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/f b/tutorials/incompressible/simpleFoam/pitzDaily/0/f
index e15e7c5db6cefa6a2b8b9daeb3415f63cfbc5ec6..8204733da271fa409d13aaf87fae64cc93f724eb 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/f
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/f
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      v2;
+    object      f;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
index 3c271e347d0d45db7e0c5bae140d03f908789cea..ac48d0bc4357716b06b25d6701f113f3d96b0365 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
index 9cbe9fd07cd12fefded5c1cef01bd5563a26f2f7..6177652dfce70ab382c218eebef1410b8652e304 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
index 4c22612f0aafb945bc424b96d0a435eaf2316f1e..f2a4a36a751a8f98b95a28bf7a47f5951c09104c 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
index 9de150055b03e9b6d9c9e4ecbe1435cd182e18b5..d709fa981a44d2a048e626685829a4223caab9b5 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index ef6d5c15f830e3a61cbb4a33d8f5dce7929af12a..fbd69c5e3f2d913b97f067d6a6989659372104ef 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index aa34863b9b7a8791a035ceadc85e6b099a35a894..fdbf186fa730a4c25888d41d7b8c195c531b68a0 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
index bc8de352610e45e80e1f6f65d34e4837af6639f7..b4768da5430c01f3308d7577dea6ce16280d8a3f 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
@@ -12,7 +12,7 @@ FoamFile
     format      ascii;
     location    "";
     class       vectorField;
-    object      coalCloudPositions;
+    object      coalCloud1Positions;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
index dc1b7a9f5cafa35056eb5da42519d45960a2aa81..92084fac25980ff5775805127e8ac635710b29fd 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
index a24b8c19f083950fc6682e02f6165c16b297418e..9197f5a3c496bdab36e91c3d91e605d45f466cd4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      O2;
+    object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
index df450036e622dae3984a1b5b10658f8eab7a90d7..a1c07efe67a33be2ba2dbded1577adf5e4acf045 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      scalarListList;
+    object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // (x y z) (u v w) d rho mDot T Cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
index 807039a2e9fef801e17adf8949af5441f5893f27..10b4291e1f5e3fe24d26c6add3b624210e5b9ee8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      scalarListList;
+    object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // (x y z) (u v w) d rho mDot T Cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
index 71d9ef11db6f6ae9184a300c4a6592ef0182080a..d92ba204fef13711aab9bdd01da8a86c7b5e9b5a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      scalarListList;
+    object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
index 5776a0c4b4be95c4c0c89538f63981d48754009f..970f3985439703c322ec5db3c73f62000e31401f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      scalarListList;
+    object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
index 6b708575620153aac8afce520ced8665df3fa1b9..09485f7c6f4849afbe894530488a919735b5eb4d 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      binary;
     class       dictionary;
     location    "constant";
-    object      SprayCloudProperties;
+    object      sprayCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
index 0d4118972d81d2730bd5641deb639f36520598c4..c14eba203e538e85176c9afa3e2ca866045a6f86 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
@@ -10,7 +10,7 @@ FoamFile
     version         2.0;
     format          ascii;
     class           dictionary;
-    object          meshQualityControls;
+    object          meshQualityDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/pointDisplacement b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/pointDisplacement
index 92758708dee5ca3aecb2c3614aafe677804c3370..e02bd9bf05cceddc24e720e56f1dab95e1806156 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/pointDisplacement
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/pointDisplacement
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       pointVectorField;
-    object      pointMotionU;
+    object      pointDisplacement;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties b/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties
index 807039a2e9fef801e17adf8949af5441f5893f27..10b4291e1f5e3fe24d26c6add3b624210e5b9ee8 100644
--- a/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties
+++ b/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      scalarListList;
+    object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // (x y z) (u v w) d rho mDot T Cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/U b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/U
index 5c4df2cdc4e824ca9518f366543cb4b3564dd0cc..6bfde3fdd199e75795a04ee07a1f2ebdec8ba4a1 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/U
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/U
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      binary;
     class       volVectorField;
-    object      Uair;
+    object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
index 2a4fcbf4fb0e2d44f8db0a15a8474649280bd20e..bfd475f47df234aba38c9621353e52e2a9edd2f0 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p
index ae516b8875b444408d4b9f7fcf641b4c02d577ab..bb700763fa9be859f99a04d0a8109c60dc6a7f6f 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      p_rgh;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
index c69a57d6de3361c3623ae9ad3d260cd93532a046..02c60b572152d22dea2c4891db2e6382fe12882d 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
@@ -10,8 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
-    object      controlDict;
+    location    "constant";
+    object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 phases (water air);
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
index cddde63f7df08a883aff9c9bf54db88dab225db6..15304751cec94adf3234374504d3c9f681a675ca 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      extrudeProperties;
+    object      extrudeMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
index 28c6948cfc672dd224c08a21989fadfa3c0827fb..22a443e643b1f7181f1fee8c4bea9c212f2cfb31 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alphawater;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/T b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/T
index b2e7a71174d8ba1c64af548b5d6c4edb3c44df00..0f29ad27fbbbf662d239a6e982e634caabae4ec4 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/T
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/T
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Tair;
+    object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties
index 843e4e92e7cc0a7dc57d9b9d1ad51ac9408175ac..54acee6bd36ae927d8a684768467566a421a7b6c 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      transportProperties;
+    object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
index f911fb0ad632ab041aed7b0e8d9e3cc5cb503892..a151a9f283dd2fb4720abb19a523a788d42912dc 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      motionProperties;
+    object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
index 75aa1fe9fee4e85d73aa4fbcc45e51daaaf1e7ce..4e2e0211e4173c1c7fbff2d9248632e64052ef3f 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      motionProperties;
+    object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax b/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
index f2fda2469f1aefc4a6c3348ced2cb0f893f2fd60..925673fb0f7574063160cd867ab81d31312948fa 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "system";
-    object      controlDict;
+    object      minMax;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
index 06888d83a841316147411be0e2e827a1cad5f009..2444ac0fea7127fea7f124c364eceaaa42e095da 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      binary;
     class       dictionary;
     location    "constant";
-    object      SprayCloudProperties;
+    object      sprayCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
index e19ccc85622b39e5b826aabeb31b8d39a07e5dda..1d8f08f123621bb006de23ff3b09b5960e6415d1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
@@ -11,7 +11,7 @@ FoamFile
     format      binary;
     class       dictionary;
     location    "constant";
-    object      SprayCloudProperties;
+    object      sprayCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties
index d2b92d8eceb30f92e4779219b2b70d0916006e87..620f9d50d9756175f31acd2fd169b32fec838d69 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/waveProperties
index f285e6d17638e701d42d215ac8b6985a802a0d12..58e422ba52856e528686b5cd7c5de2df9527c3c6 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties
index 88386246c7c90d5c6c5c33667483c61b8bff2ee1..c4aef8617e383bd59ce4d11181a1c7e89ebd5a59 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/waveProperties
index 57ab91a543d7d6eabcc1bea0600f320be74dab01..9a7d0826282501a0892e068a7b1cac6c23aa15c3 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/waveProperties
index 55497bf88ec8d38a2f181573aac0d4b64892ac3b..6a572f9b3b17baf34b6c187126e4196d267adc4d 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties
index f96dfbeb590ada941c60193925f6552eb7f6c061..089e1a76e833fa190b129611785200cec100f892 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties
index bae079fe05b68de9a3e93ddfa6541e032b223219..fb5df9b0b8f25fe0ebb89d519f24ba472a06de4d 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties
index 9ea83ba45733dc03d073a0a7373c2a2168afb63a..d3ac13f28ad4f4dbf812ea43ae8d6709ace4e536 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/waveProperties
index ee2bb5642e1e3423120bb90debcc7f4825fb2ab4..89d557ae782382704686b45f35a5d7a1ba965fc9 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/waveProperties
index 1870cb67ebd59c9a60e0627adb557cb284c9e5e1..cc9d9640f76bb1857df2e9359d4cc25a654cc684 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/waveProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      wavesProperties;
+    object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
index 6bbb616b549e174c1360681c03405f0a628bcf8d..97b750221fd83e440a49b2001efcf86fed0b8d43 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "system";
-    object      fvSolution;
+    object      setAlphaFieldDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
index f4424dabcbbb45872abfb089bc6a017d2a9412bb..38bf1af541296ee8342293fa5719fa1d816b95db 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "system";
-    object      fvSolution;
+    object      setAlphaFieldDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
index ac15050b1fd4229accbcb7f63b6fbf7c053eecf0..26d5a05b624d1a4eaf63f6dd7725fe0187c7e867 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "system";
-    object      fvSolution;
+    object      setAlphaFieldDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
index 8990547c1247a42fdacf7dcc24d0aa9b81062b86..ac497d6c6c200d77a610969d86931c6afd2c22e3 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "system";
-    object      fvSolution;
+    object      setAlphaFieldDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
index a500bbd2be3c8d94e1e77fa2f42bf96971d3dfe7..16fefd356038575e9722547ca11f258c12daddb7 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "system";
-    object      fvSolution;
+    object      setAlphaFieldDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.other.orig b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.other.orig
index 901250ffc5bbb4557b1b1ff6bfc14933b2a44234..7db88592ed755de8d6e0662e0b0e6d732c61e2c2 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.other.orig
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.other.orig
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha2;
+    object      alpha.other;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.water.orig b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.water.orig
index 2f07ff03278432af4bd4a75d2a30796bf56c3f18..c0a881b0282d6910fa722a9e0002913bac5e76aa 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.water.orig
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.water.orig
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha3;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.orig b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.orig
index a0d664e92eb122af34e99aa47d25ce87c009d493..dd910a40f92ab88b4452aa89b0df215f21643142 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.orig
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alphaair;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water
index 65a43bf1389b8638ad8601993af6c498ee456718..a2206fb27f15f1ed56a1bac4706ab378a15a5359 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volVectorField;
     location    "0";
-    object      Uwater;
+    object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water
index 65a43bf1389b8638ad8601993af6c498ee456718..a2206fb27f15f1ed56a1bac4706ab378a15a5359 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volVectorField;
     location    "0";
-    object      Uwater;
+    object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
index 9ace6d71891d2fa021856485955caf1655a5787e..699580daee3b085838979f2a987f26fc19ce2d4d 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      motionProperties;
+    object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement
index f0e2ea4b573f7e2550b41f3f23eee069004ecbbd..23436d42249f2feceb3131119462b73da0c54c17 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       pointVectorField;
     location    "0";
-    object      pointMotionU;
+    object      pointDisplacement;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
index 32f97005577b9ff8894e1a69ed4b032a96a5f8b9..5bee416d15c477110370771a63cf0ddcf5bc8c6d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      k;
+    object      nut.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
index 32f97005577b9ff8894e1a69ed4b032a96a5f8b9..a4c707ce406f8b54b9e672492c576c4e904e1ef9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      k;
+    object      nut.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
index ad01493c33ba8d3e9a0a584f44fb167505b5a7fa..27b3fb14a445aedbaaca004635abae95cee9e665 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      T1;
+    object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
index b46ace0ebd7f0c6bc7065ea8d54046ab19237fbc..681452ffcafd0f40f03d181e068349c69b018e75 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      T2;
+    object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
index ec6c7b2ca843d6c74fea63e17803117bbfa37e39..853e922f2c7952db31c4295d59572154f0a03b21 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      U1;
+    object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
index e156addb8395dba6f754cbc7b4c8e042d592722b..4dc6e79ade939f477f8f6e6bcb4632235c921c94 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      U2;
+    object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
index 1b7f6a18e37b3bf21c78588fb1ca945da995d3cb..6018b872a37bdcc92446c5b62911b4626c436f73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      AIR.steam;
+    object      water.steam;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
index 32f97005577b9ff8894e1a69ed4b032a96a5f8b9..5bee416d15c477110370771a63cf0ddcf5bc8c6d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      k;
+    object      nut.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
index 32f97005577b9ff8894e1a69ed4b032a96a5f8b9..a4c707ce406f8b54b9e672492c576c4e904e1ef9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      k;
+    object      nut.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
index ad01493c33ba8d3e9a0a584f44fb167505b5a7fa..27b3fb14a445aedbaaca004635abae95cee9e665 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      T1;
+    object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
index b46ace0ebd7f0c6bc7065ea8d54046ab19237fbc..681452ffcafd0f40f03d181e068349c69b018e75 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      T2;
+    object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
index ec6c7b2ca843d6c74fea63e17803117bbfa37e39..853e922f2c7952db31c4295d59572154f0a03b21 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      U1;
+    object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
index e156addb8395dba6f754cbc7b4c8e042d592722b..4dc6e79ade939f477f8f6e6bcb4632235c921c94 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      U2;
+    object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
index 11403d9c3f57c44e9dd48498a4ba6fb77c4cd1e1..ff65ba1d74964b733f78cc0f4db621984662c38a 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      autoHexMeshDict;
+    object      snappyHexMeshDict;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //