From 16a637918399465edbcfa08a598a092680e84b78 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Tue, 26 Jun 2018 17:37:38 +0100
Subject: [PATCH] TUT: Cleaned up headers

---
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut      | 2 +-
 .../flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char   | 2 +-
 .../flameSpreadWaterSuppressionPanel/constant/pyrolysisZones  | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/H2O         | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0/nut         | 2 +-
 tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/H2O     | 3 ++-
 .../compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx | 2 +-
 .../compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0/nut     | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions       | 2 +-
 .../RAS/annularThermalMixer/constant/caseSettings             | 4 ++--
 tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0/nut   | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict     | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/fvOptions           | 2 +-
 .../compressible/sonicDyMFoam/movingCone/0/pointMotionUx      | 2 +-
 .../periodicCubeArgon/system/mdInitialiseDict                 | 3 +--
 .../periodicCubeArgon/system/potentialDict                    | 2 +-
 .../periodicCubeWater/system/mdInitialiseDict                 | 2 +-
 .../periodicCubeWater/system/potentialDict                    | 2 +-
 .../mdFoam/nanoNozzle/system/mdInitialiseDict                 | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/potentialDict  | 2 +-
 .../buoyantCavity/constant/turbulenceProperties               | 2 +-
 .../circuitBoardCooling/constant/turbulenceProperties         | 2 +-
 .../hotRadiationRoom/constant/turbulenceProperties            | 2 +-
 .../hotRadiationRoomFvDOM/constant/turbulenceProperties       | 2 +-
 .../heatTransfer/chtMultiRegionFoam/reverseBurner/0/gas/nut   | 2 +-
 .../heatExchanger/0.orig/porous/p_rgh                         | 2 +-
 .../pitzDaily/constant/turbulenceProperties                   | 2 +-
 .../lumpedPointMotion/building/steady/0.orig/omega            | 2 +-
 .../surfaceMountedCube/fullCase/constant/turbulenceProperties | 2 +-
 .../pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T | 2 +-
 .../RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega       | 2 +-
 .../pimpleFoam/laminar/movingCone/0/pointMotionUx             | 2 +-
 .../pimpleFoam/laminar/planarContraction/0/sigma              | 2 +-
 .../pimpleFoam/laminar/planarPoiseuille/0/sigma               | 2 +-
 .../LES/motorBike/motorBike/constant/turbulenceProperties     | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/0/f             | 2 +-
 .../windAroundBuildings/constant/turbulenceProperties         | 2 +-
 .../DPMFoam/Goldschmidt/constant/kinematicCloudProperties     | 2 +-
 .../MPPICFoam/Goldschmidt/constant/kinematicCloudProperties   | 2 +-
 .../MPPICFoam/column/constant/kinematicCloudProperties        | 2 +-
 .../MPPICFoam/cyclone/constant/kinematicCloudProperties       | 2 +-
 .../injectionChannel/constant/kinematicCloudProperties        | 2 +-
 .../simplifiedSiwek/constant/coalCloud1Positions              | 2 +-
 .../mixerVesselAMI2D/constant/kinematicCloudProperties        | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2  | 2 +-
 .../cylinder/constant/parcelInjectionProperties               | 2 +-
 .../filter/constant/parcelInjectionProperties                 | 2 +-
 .../rivuletPanel/constant/parcelInjectionProperties           | 2 +-
 .../splashPanel/constant/parcelInjectionProperties            | 2 +-
 .../sprayFoam/aachenBomb/constant/sprayCloudProperties        | 2 +-
 .../mesh/foamyHexMesh/mixerVessel/system/meshQualityDict      | 2 +-
 .../box2D_moveDynamicMesh/0.orig/pointDisplacement            | 2 +-
 .../mesh/parallel/filter/constant/parcelInjectionProperties   | 2 +-
 tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/U       | 2 +-
 .../twoPhasePachuka/constant/kinematicCloudProperties         | 2 +-
 .../compressibleInterDyMFoam/laminar/sloshingTank2D/0/p       | 2 +-
 .../laminar/sphereDrop/constant/transportProperties           | 4 ++--
 .../laminar/climbingRod/system/extrudeMeshDict                | 2 +-
 .../laminar/depthCharge3D/0.orig/alpha.water                  | 2 +-
 .../interCondensatingEvaporatingFoam/condensatingVessel/0/T   | 2 +-
 .../condensatingVessel/constant/thermophysicalProperties      | 2 +-
 .../interFoam/RAS/floatingObject/constant/dynamicMeshDict     | 2 +-
 .../RAS/floatingObject/constant/dynamicMeshDict.sixDoF        | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/system/minMax    | 2 +-
 .../constant/sprayCloudProperties                             | 2 +-
 .../lagrangianParticleInjection/constant/sprayCloudProperties | 2 +-
 .../laminar/waveExampleCnoidal/constant/waveProperties        | 2 +-
 .../constant/waveProperties                                   | 2 +-
 .../laminar/waveExampleSolitary/constant/waveProperties       | 2 +-
 .../waveExampleSolitaryGrimshaw/constant/waveProperties       | 2 +-
 .../waveExampleSolitaryMcCowan/constant/waveProperties        | 2 +-
 .../laminar/waveExampleStokesI/constant/waveProperties        | 2 +-
 .../laminar/waveExampleStokesII/constant/waveProperties       | 2 +-
 .../laminar/waveExampleStokesV/constant/waveProperties        | 2 +-
 .../laminar/waveExampleStreamFunction/constant/waveProperties | 2 +-
 .../laminar/waveMangroveInteraction/constant/waveProperties   | 2 +-
 .../interIsoFoam/discInConstantFlow/system/setAlphaFieldDict  | 2 +-
 .../discInReversedVortexFlow/system/setAlphaFieldDict         | 2 +-
 .../notchedDiscInSolidBodyRotation/system/setAlphaFieldDict   | 2 +-
 .../sphereInReversedVortexFlow/system/setAlphaFieldDict       | 2 +-
 .../interIsoFoam/standingWave/system/setAlphaFieldDict        | 2 +-
 .../interMixingFoam/laminar/damBreak/0/alpha.other.orig       | 2 +-
 .../interMixingFoam/laminar/damBreak/0/alpha.water.orig       | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/0/alpha.air.orig         | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/0.orig/U.water         | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water     | 2 +-
 .../floatingBody/background/constant/dynamicMeshDict          | 2 +-
 .../oscillatingBox/0.orig/pointDisplacement                   | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air      | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water    | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air   | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air   | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water | 2 +-
 .../laminar/steamInjection/0/water.steam                      | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air   | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air           | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water         | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air           | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water         | 2 +-
 .../snappyMultiRegionHeater/system/snappyHexMeshDict          | 2 +-
 103 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut
index d4e02be7340..71601739536 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 014405cadb6..c95de4480e1 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 7de75799a36..d7ac08a6d71 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 e56f20fb80d..a15d6af4110 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 1cd5c32cdf2..52bb299b61b 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 1ebe0ef8b77..bd6ef6ea6a9 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 ff16ba9bb9b..b8802196684 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 ce47ddb5f77..e1a2b9c7677 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 ed8c66eeed3..b8a731dfbe7 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 48e2e8e07cd..302e78b1369 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 76fb68fa877..a6adddb3eb4 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 ce47ddb5f77..e1a2b9c7677 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 ed8c66eeed3..b8a731dfbe7 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 48e2e8e07cd..302e78b1369 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 ff16ba9bb9b..b8802196684 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 5885cbd6ab1..e0548316dee 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 5c01f985bf5..7d6aaa1ab9b 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 55d5c668b54..dfcc6258356 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 1baa7ef3838..53e4ba1665f 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 5bfc36fd384..3f04a5aded0 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 1baa7ef3838..53e4ba1665f 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 18ed727d32c..496e3ca4f08 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 8113518c301..438aa0051b5 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 21379f0c0cb..2be0cd10376 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 21379f0c0cb..2be0cd10376 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 dbb611c28f3..8fa43ee8782 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 2476c4c9202..5ccdae269bb 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 21379f0c0cb..2be0cd10376 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 20e3b3a72e5..abbceb8de89 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 152018ed959..45dd798309a 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 ab527c9b170..c71c101c064 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 ebed555eafc..d0dc78cb5e8 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 047ec1e53b9..d8bce6921ca 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 0f019915d5b..ff2d9ae9250 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 8d39df3602a..d43b3e65726 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 e97db2746ca..3c228f7bbfb 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 e15e7c5db6c..8204733da27 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 3c271e347d0..ac48d0bc435 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 9cbe9fd07cd..6177652dfce 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 4c22612f0aa..f2a4a36a751 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 9de150055b0..d709fa981a4 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 ef6d5c15f83..fbd69c5e3f2 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 aa34863b9b7..fdbf186fa73 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 bc8de352610..b4768da5430 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 dc1b7a9f5ca..92084fac259 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 a24b8c19f08..9197f5a3c49 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 df450036e62..a1c07efe67a 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 807039a2e9f..10b4291e1f5 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 71d9ef11db6..d92ba204fef 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 5776a0c4b4b..970f3985439 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 6b708575620..09485f7c6f4 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 0d4118972d8..c14eba203e5 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 92758708dee..e02bd9bf05c 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 807039a2e9f..10b4291e1f5 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 5c4df2cdc4e..6bfde3fdd19 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 2a4fcbf4fb0..bfd475f47df 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 ae516b8875b..bb700763fa9 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 c69a57d6de3..02c60b57215 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 cddde63f7df..15304751cec 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 28c6948cfc6..22a443e643b 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 b2e7a71174d..0f29ad27fbb 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 843e4e92e7c..54acee6bd36 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 f911fb0ad63..a151a9f283d 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 75aa1fe9fee..4e2e0211e41 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 f2fda2469f1..925673fb0f7 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 06888d83a84..2444ac0fea7 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 e19ccc85622..1d8f08f1236 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 d2b92d8eceb..620f9d50d97 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 f285e6d1763..58e422ba528 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 88386246c7c..c4aef8617e3 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 57ab91a543d..9a7d0826282 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 55497bf88ec..6a572f9b3b1 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 f96dfbeb590..089e1a76e83 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 bae079fe05b..fb5df9b0b8f 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 9ea83ba4573..d3ac13f28ad 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 ee2bb5642e1..89d557ae782 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 1870cb67ebd..cc9d9640f76 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 6bbb616b549..97b750221fd 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 f4424dabcbb..38bf1af5412 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 ac15050b1fd..26d5a05b624 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 8990547c124..ac497d6c6c2 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 a500bbd2be3..16fefd35603 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 901250ffc5b..7db88592ed7 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 2f07ff03278..c0a881b0282 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 a0d664e92eb..dd910a40f92 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 65a43bf1389..a2206fb27f1 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 65a43bf1389..a2206fb27f1 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 9ace6d71891..699580daee3 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 f0e2ea4b573..23436d42249 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 32f97005577..5bee416d15c 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 32f97005577..a4c707ce406 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 ad01493c33b..27b3fb14a44 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 b46ace0ebd7..681452ffcaf 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 ec6c7b2ca84..853e922f2c7 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 e156addb839..4dc6e79ade9 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 1b7f6a18e37..6018b872a37 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 32f97005577..5bee416d15c 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 32f97005577..a4c707ce406 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 ad01493c33b..27b3fb14a44 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 b46ace0ebd7..681452ffcaf 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 ec6c7b2ca84..853e922f2c7 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 e156addb839..4dc6e79ade9 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 11403d9c3f5..ff65ba1d749 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;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-- 
GitLab