diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
index f9c1ae9b09..f2b0029933 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
@@ -122,7 +122,7 @@ hollowConeInjectorCoeffs
 {
     sizeDistribution
     {
-        pdfType         RosinRammler;
+        type        RosinRammler;
         RosinRammlerDistribution
         {
             minValue        1e-06;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index 28429e4b88..00df650cbe 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -130,7 +130,7 @@ subModels
         U0              ( 0 -10 0 );
         sizeDistribution
         {
-            distributionModelType RosinRammler;
+            type        RosinRammler;
             RosinRammlerDistribution
             {
                 minValue        5e-06;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index ffd13e92f1..de4b6e4f21 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -106,7 +106,7 @@ subModels
         U0              ( 0 0 0 );
         sizeDistribution
         {
-            distributionModelType RosinRammler;
+            type        RosinRammler;
             RosinRammlerDistribution
             {
                 minValue        5e-06;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
index 5929021b71..3a16d684ef 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
@@ -24,8 +24,9 @@ createBaffles cycLeft '(cycLeft_half0 cycLeft_half1)' -overwrite > log.createBaf
 
 # create the second cyclic - rhs of porous zone
 createBaffles cycRight '(cycRight_half0 cycRight_half1)' -overwrite > log.createBaffles2 2>&1
+
 # Initialise newly created patchFields to 0
-changeDictionary
+runApplication changeDictionary
 
 runApplication $application
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index 3da7874bf9..ce3b2863d9 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -55,7 +55,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -98,31 +98,29 @@ subModels
         );
     }
 
-    InjectionModel  ReactingMultiphaseLookupTableInjection;
+    injectionModel  reactingMultiphaseLookupTableInjection;
 
-    DispersionModel none;
+    dispersionModel none;
 
-    PatchInteractionModel LocalInteraction;
+    patchInteractionModel localInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    PostProcessingModel PatchPostProcessing;
+    postProcessingModel patchPostProcessing;
 
-    DevolatilisationModel none;
+    devolatilisationModel none;
 
-    SurfaceReactionModel none;
+    surfaceReactionModel none;
 
-    SurfaceFilmModel none;
-
-    CollisionModel  none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    ReactingMultiphaseLookupTableInjectionCoeffs
+    reactingMultiphaseLookupTableInjectionCoeffs
     {
         massTotal       1e-2;
         parcelBasisType mass;
@@ -132,7 +130,7 @@ subModels
         parcelsPerSecond 250;
     }
 
-    LocalInteractionCoeffs
+    localInteractionCoeffs
     {
         patches
         (
@@ -156,7 +154,7 @@ subModels
         BirdCorrection  true;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -176,14 +174,14 @@ subModels
         YSolidTot0      0;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
 
         activeLiquids   ( H2O );
     }
 
-    PatchPostProcessingCoeffs
+    patchPostProcessingCoeffs
     {
         maxStoredParcels 20;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index 644a5dacd5..d4295fefe2 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -98,31 +98,29 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel none;
+    dispersionModel none;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    DevolatilisationModel none;
+    devolatilisationModel none;
 
-    SurfaceReactionModel none;
+    surfaceReactionModel none;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    SurfaceFilmModel none;
-
-    CollisionModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       5.23599e-10; // 1 droplet of density 1000 kg/m3
         parcelBasisType mass;
@@ -131,7 +129,7 @@ subModels
         U0              (0 0 0);
         sizeDistribution
         {
-            distributionModelType uniform;
+            type uniform;
             uniformDistribution
             {
                 minValue        100e-06;
@@ -139,7 +137,8 @@ subModels
             }
         }
     }
-    StandardWallInteractionCoeffs
+
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
@@ -149,7 +148,7 @@ subModels
         BirdCorrection  off;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -169,7 +168,7 @@ subModels
         YSolidTot0      0;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference; // latentHeat;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index be83c13df0..f5665ebdc4 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -55,7 +55,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -98,31 +98,29 @@ subModels
         );
     }
 
-    InjectionModel  PatchInjection;
+    injectionModel  patchInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    DevolatilisationModel none;
+    devolatilisationModel none;
 
-    SurfaceReactionModel none;
+    surfaceReactionModel none;
 
-    PostProcessingModel PatchPostProcessing;
+    postProcessingModel patchPostProcessing;
 
-    SurfaceFilmModel none;
-
-    CollisionModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    PatchInjectionCoeffs
+    patchInjectionCoeffs
     {
         SOI             0.01;
         massTotal       8;
@@ -134,7 +132,7 @@ subModels
         flowRateProfile constant 1;
         sizeDistribution
         {
-            distributionModelType general;
+            type        general;
             generalDistribution
             {
                 distribution
@@ -161,7 +159,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
@@ -171,7 +169,7 @@ subModels
         BirdCorrection  off;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -191,14 +189,14 @@ subModels
         YSolidTot0      0;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
 
         activeLiquids   ( H2O );
     }
 
-    PatchPostProcessingCoeffs
+    patchPostProcessingCoeffs
     {
         maxStoredParcels 100;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index 4a50895786..5e9e99481a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -55,7 +55,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -95,27 +95,25 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel none;
+    dispersionModel none;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SinglePhaseMixture;
+    compositionModel singlePhaseMixture;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    CollisionModel none;
-
-    SurfaceFilmModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       1e-8;
         parcelBasisType mass;
@@ -124,7 +122,7 @@ subModels
         U0              ( 0 0 0 );
         sizeDistribution
         {
-            distributionModelType uniform;
+            type        uniform;
             uniformDistribution
             {
                 minValue        1e-04;
@@ -133,7 +131,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
@@ -143,7 +141,7 @@ subModels
         BirdCorrection  true;
     }
 
-    SinglePhaseMixtureCoeffs
+    singlePhaseMixtureCoeffs
     {
         phases
         (
@@ -154,7 +152,7 @@ subModels
         );
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
 
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
index 9ee68940d4..5805622a31 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
@@ -67,19 +67,17 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    SurfaceFilmModel none;
+    surfaceFilmModel none;
 
-    CollisionModel none;
-
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       0.0002;
         parcelBasisType mass;
@@ -88,7 +86,7 @@ subModels
         U0              ( 0 0 0 );
         sizeDistribution
         {
-            distributionModelType RosinRammler;
+            type        RosinRammler;
             RosinRammlerDistribution
             {
                 minValue        5e-05;
@@ -99,7 +97,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
index 2d7d4b18e7..8fc1578e36 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
@@ -46,7 +46,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -82,23 +82,21 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    CollisionModel none;
-
-    SurfaceFilmModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       0.0001;
         parcelBasisType mass;
@@ -107,7 +105,7 @@ subModels
         U0              ( 0 0 0 );
         sizeDistribution
         {
-            distributionModelType RosinRammler;
+            type        RosinRammler;
             RosinRammlerDistribution
             {
                 minValue        5e-06;
@@ -118,7 +116,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 45a6113ef3..9ab2fcf8ae 100644
--- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -64,7 +64,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -109,32 +109,30 @@ subModels
         );
     }
 
-    InjectionModel  PatchInjection;
+    injectionModel  patchInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    DevolatilisationModel none;
+    devolatilisationModel none;
 
-    SurfaceReactionModel none;
+    surfaceReactionModel none;
 
-    PostProcessingModel ParticleTracks;
+    postProcessingModel particleTracks;
 
-    SurfaceFilmModel none;
-
-    CollisionModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
 
-    PatchInjectionCoeffs
+    patchInjectionCoeffs
     {
         massFlowRate    0.8e-03;
         parcelBasisType mass;
@@ -145,7 +143,7 @@ subModels
         flowRateProfile constant 1;
         sizeDistribution
         {
-            distributionModelType general;
+            type        general;
             generalDistribution
             {
                 distribution
@@ -172,7 +170,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
@@ -182,7 +180,7 @@ subModels
         BirdCorrection  off;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -202,19 +200,19 @@ subModels
         YSolidTot0      0;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
         activeLiquids   ( H2O );
     }
 
-    PatchPostProcessingCoeffs
+    patchPostProcessingCoeffs
     {
         maxStoredParcels 100;
         patches         ( outlet );
     }
 
-    ParticleTracksCoeffs
+    particleTracksCoeffs
     {
         trackInterval   5;
         maxSamples      1000000;