diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index 58bea3ed998e6951352a8be4943088bb4a66ec99..61171f27b3a8bcf0d07a1c507767346b3d0ce498 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readCombustionProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 1320b19d31440189abf86001dfff6f21abe28b48..9b0344165af379827e768cf467f82b1f3a3b5155 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -72,31 +72,31 @@ Description
 
 int main(int argc, char *argv[])
 {
-#   include "setRootCase.H"
+    #include "setRootCase.H"
 
-#   include "createTime.H"
-#   include "createDynamicFvMesh.H"
-#   include "readCombustionProperties.H"
-#   include "readEnvironmentalProperties.H"
-#   include "createFields.H"
-#   include "readPISOControls.H"
-#   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
-#   include "setInitialDeltaT.H"
+    #include "createTime.H"
+    #include "createDynamicFvMesh.H"
+    #include "readCombustionProperties.H"
+    #include "readGravitationalAcceleration.H"
+    #include "createFields.H"
+    #include "readPISOControls.H"
+    #include "initContinuityErrs.H"
+    #include "readTimeControls.H"
+    #include "setInitialDeltaT.H"
 
-scalar StCoNum = 0.0;
+    scalar StCoNum = 0.0;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
-#       include "readTimeControls.H"
-#       include "readPISOControls.H"
-#       include "CourantNo.H"
+        #include "readTimeControls.H"
+        #include "readPISOControls.H"
+        #include "CourantNo.H"
 
-#       include "setDeltaT.H"
+        #include "setDeltaT.H"
 
         runTime++;
 
@@ -157,7 +157,7 @@ scalar StCoNum = 0.0;
 
 //        if (mesh.moving() || meshChanged)
 //        {
-//#           include "correctPhi.H"
+//            #include "correctPhi.H"
 //        }
 
             // Make the fluxes relative to the mesh motion
@@ -165,23 +165,23 @@ scalar StCoNum = 0.0;
         }
 
 
-#       include "rhoEqn.H"
-#       include "UEqn.H"
+        #include "rhoEqn.H"
+        #include "UEqn.H"
 
         // --- PISO loop
         for (int corr=1; corr<=nCorr; corr++)
         {
-#           include "bEqn.H"
-#           include "ftEqn.H"
-#           include "huEqn.H"
-#           include "hEqn.H"
+            #include "bEqn.H"
+            #include "ftEqn.H"
+            #include "huEqn.H"
+            #include "hEqn.H"
 
             if (!ign.ignited())
             {
                 hu == h;
             }
 
-#           include "pEqn.H"
+            #include "pEqn.H"
         }
 
         turbulence->correct();
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 13a464a7550a5907d680772c21f565537eb37f2c..4c544b433e3b0aba41261d237fc198bc616412a4 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readCombustionProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/combustion/dieselEngineFoam/createSpray.H b/applications/solvers/combustion/dieselEngineFoam/createSpray.H
index 4bc1a32f11becdd7e88f040685a97ae98be7e4e3..ea4d0121b691884e8a774bb5c77e49bf836f10ac 100644
--- a/applications/solvers/combustion/dieselEngineFoam/createSpray.H
+++ b/applications/solvers/combustion/dieselEngineFoam/createSpray.H
@@ -23,7 +23,7 @@ spray dieselSpray
     composition,
     gasProperties,
     thermo,
-    environmentalProperties
+    g
 );
 
 scalar gasMass0 = fvc::domainIntegrate(rho).value();
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index 7d3022a86fa1489430aec2c6e5c9965357d8c0e2..88b8f703d9436f50cefe69c5b705bc407e07604f 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     #include "createEngineTime.H"
     #include "createEngineMesh.H"
     #include "createFields.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readCombustionProperties.H"
     #include "createSpray.H"
     #include "initContinuityErrs.H"
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 1f2406ccd5fed4086177234e78c85bdd07d59c92..d5eeefc98b4b4766510835745da39417dd8eb9de 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readCombustionProperties.H"
     #include "createSpray.H"
     #include "initContinuityErrs.H"
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index abb28ffd4465846bee52b9f04bee3fed13b91ca1..35921313c337967ad0286f392b2d7a2fc70f5951 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index 1c3b132cef3a3f4a265c0aab7c933a4e766c0db4..680bd784e0e2a54876111eecdf5ca23a6d06119d 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
index a8ff18374220e04a17c01dcd59325f030ea38361..efe70a070862c769324fe4611a40de048f0f0da8 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index 63b938fa3625c2a15475b5ab5eb2157ce4cd9416..fbb5b6c5dc05d637c30cf6810ffe3c9d9116bf09 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
index b5055812c40e362d420c08ab862c9db91e2469c5..fb6ad9571ad18b2344f647e360ae320f56e47569 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 52f915bd7abe4b59a89aa7b30f1e40de0279e07c..c3a453bc4e31bfb2a7ec4d7be41ea1de607ed055 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index c869eff89956a1b4e581fcdf6e1adf4643ecbfe4..491ce1a091d1c7e66d24e381868207b9256e837e 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index 7aa01dee7939de0bf5ce3595f0cefc73a5d7653f..1826a77217e86ac89941941c2d8e452d783e94fb 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -4,6 +4,7 @@
     PtrList<volScalarField> KFluid(fluidRegions.size());
     PtrList<volVectorField> UFluid(fluidRegions.size());
     PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
+    PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
     PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
     PtrList<volScalarField> DpDtFluid(fluidRegions.size());
 
@@ -95,6 +96,23 @@
             )
         );
 
+        Info<< "    Adding to gFluid\n" << endl;
+        gFluid.set
+        (
+            i,
+            new uniformDimensionedVectorField
+            (
+                IOobject
+                (
+                    "g",
+                    runTime.constant(),
+                    fluidRegions[i],
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                )
+            )
+        );
+
         Info<< "    Adding to turbulence\n" << endl;
         turbulence.set
         (
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
index aec08349eca1f3d06d53f0f22b36d9ab19e2f3a7..30a2e1089f8875cf507ac0d4d76492830cf9647c 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
@@ -19,27 +19,4 @@
                 )
             )
         );
-
-        // Force calculation of geometric properties to prevent it being done
-        // later in e.g. some boundary evaluation
-        //(void)fluidRegions[i].weights();
-        //(void)fluidRegions[i].deltaCoeffs();
-
-        // Attach environmental properties to each region
-        autoPtr<IOdictionary> environmentalProperties
-        (
-            new IOdictionary
-            (
-                IOobject
-                (
-                    "environmentalProperties",
-                    runTime.constant(),
-                    fluidRegions[i],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-
-        environmentalProperties.ptr()->store();
     }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index 29aea044664c8a7c2045525c5e94d94e0c0b1e48..50a3011484689c25f6a26cce1e454bcbd20239b2 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -5,6 +5,8 @@
     volScalarField& K = KFluid[i];
     volVectorField& U = UFluid[i];
     surfaceScalarField& phi = phiFluid[i];
+    const dimensionedVector& g = gFluid[i];
+
     compressible::turbulenceModel& turb = turbulence[i];
     volScalarField& DpDt = DpDtFluid[i];
 
@@ -13,9 +15,3 @@
     volScalarField& h = thermo.h();
 
     const dimensionedScalar massIni("massIni", dimMass, initialMassFluid[i]);
-
-    const dictionary& environmentalProperties =
-        fluidRegions[i].lookupObject<IOdictionary>
-        ("environmentalProperties");
-
-    const dimensionedVector g(environmentalProperties.lookup("g"));
diff --git a/applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
similarity index 50%
rename from applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H
rename to applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
index 866335eef14ff9f5a032a05d7b1b135a2b942070..d609c186144ddcf804ec00e7ac2b1707735e0c32 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
@@ -1,10 +1,10 @@
-Info<< "\nReading environmentalProperties" << endl;
+Info<< "\nReading gravitationalProperties" << endl;
 
-IOdictionary environmentalProperties
+IOdictionary gravitationalProperties
 (
     IOobject
     (
-        "environmentalProperties",
+        "gravitationalProperties",
         runTime.constant(),
         mesh,
         IOobject::MUST_READ,
@@ -12,10 +12,10 @@ IOdictionary environmentalProperties
     )
 );
 
-const dimensionedVector g(environmentalProperties.lookup("g"));
-const Switch rotating(environmentalProperties.lookup("rotating"));
+const dimensionedVector g(gravitationalProperties.lookup("g"));
+const Switch rotating(gravitationalProperties.lookup("rotating"));
 const dimensionedVector Omega =
-    rotating ? environmentalProperties.lookup("Omega")
+    rotating ? gravitationalProperties.lookup("Omega")
              : dimensionedVector("Omega", -dimTime, vector(0,0,0));
 const dimensionedScalar magg = mag(g);
 const dimensionedVector gHat = g/magg;
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 162d81ddaab17ec7087b5121d9a076b7bdf0f538..3fb6dee9fc2732757098c9af18fb94a92d82b2c1 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 9c10a7a617acdfcff9a4d8e6eafe4b7a056cb2cf..8a7fb290b8493a21b5cbfb24ccec1438736bfa4c 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createClouds.H"
     #include "createRadiationModel.H"
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index 2922d0bdf89dac23d2eb9249b294ef3ddad98634..5d3705430f9888c1dbbb1f3910e496de144ea611 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createRadiationModel.H"
     #include "createClouds.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 4dd5f27934dc7cd2487cc44a993e2a066e92fadc..62f8f4834a93529078603ab923a7336c60a7ae90 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createClouds.H"
     #include "createRadiationModel.H"
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index 2039346411b21b7ac84a633416040c4e1ecc71d0..98ec825db484a5a4ac4c55d7064d09933e2f9448 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "compressibleCourantNo.H"
 
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index af6de6def0bb1d6561b24052aee46724b67a2f54..e544c6e30bb3f0ed607d8f49db571c5c1c3a06e8 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 176900f0c63aaa65a7b8db19d0a2da8e1330614b..afe1114d22d73df7429e9e4d0bf2e67235134221 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index ff5a66912384e81d4246a0d5d36d9d932fd992f9..1ab9361f0b40870d71d6e3e3b3d750a1be6a4573 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 466333ff3014a6fa3942a556846e6edd7ae49316..d353012e48baa57e3b99f07b701e87390f20a848 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index b111351c39dbaef4cbb3eaaa3ef08707221baf14..c752b300e178a4005913a8497ba42a27ebf2aa90 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index d50dcc0b0e912f3162db5966108ccc7bf29a0337..d08eec4159933c1bf6a880bb9f97fc3413846cf7 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index b6968ca1a11c4a8b664b2c1721c0d608a884dad4..e2c9c643a676ecc8fd1be6a4a830c4da676edde4 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index e68ddbb0f0710ab911cc6855763e624c818c9883..942ed729bedc1f24eeffd66cba1bcf727b70fca0 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 63991f149e513901c1e15dda5effeeda7567ca28..f7ebe5f721eeaa6e17e6dd25c7e6aa043ee2e875 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPIMPLEControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index a28d929578081eb03bee4d6599b6575dc40341b7..05888429bf53e88049188d758c7094ab1cf1689f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "readPPProperties.H"
     #include "initContinuityErrs.H"
diff --git a/src/finiteVolume/cfdTools/general/include/fvCFD.H b/src/finiteVolume/cfdTools/general/include/fvCFD.H
index 4c8935645273c51f6d59664f6f7dd6f67df62d60..95f566bb1b37e56d2558a5356aaa6d3b7b021811 100644
--- a/src/finiteVolume/cfdTools/general/include/fvCFD.H
+++ b/src/finiteVolume/cfdTools/general/include/fvCFD.H
@@ -9,6 +9,7 @@
 #include "fvMatrices.H"
 #include "fvm.H"
 #include "linear.H"
+#include "uniformDimensionedFields.H"
 #include "calculatedFvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
 #include "adjustPhi.H"
diff --git a/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H b/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H
deleted file mode 100644
index 7f99d0153fe7906064d2c2368dca640cbd0a9d87..0000000000000000000000000000000000000000
--- a/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H
+++ /dev/null
@@ -1,15 +0,0 @@
-    Info << "\nReading environmentalProperties" << endl;
-
-    IOdictionary environmentalProperties
-    (
-        IOobject
-        (
-            "environmentalProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
diff --git a/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
new file mode 100644
index 0000000000000000000000000000000000000000..2389d0bd2b72d87f0fe4d599aaeb0463e8bfc51d
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
@@ -0,0 +1,12 @@
+    Info << "\nReading g" << endl;
+    uniformDimensionedVectorField g
+    (
+        IOobject
+        (
+            "g",
+            runTime.constant(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
index cafc55aa3a534df59152b79f321556edef625290..12544a105f24d2f52284b91cd9677e7ca78cb033 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
@@ -28,6 +28,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
+#include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -110,10 +111,8 @@ void buoyantPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const dictionary& environmentalProperties
-        = db().lookupObject<IOdictionary>("environmentalProperties");
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
+    const uniformDimensionedVectorField& g =
+        db().lookupObject<uniformDimensionedVectorField>("g");
 
     const fvPatchField<scalar>& rho =
         patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index dfda8caf521d7e6f3733d3e4bf640fbfd58ee22f..f47606f86e4fd9cc178ca58d7ceeaa55bbfff4e3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -29,7 +29,7 @@ License
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "surfaceFields.H"
-
+#include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -126,10 +126,8 @@ void Foam::uniformDensityHydrostaticPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const dictionary& environmentalProperties
-        = db().lookupObject<IOdictionary>("environmentalProperties");
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
+    const uniformDimensionedVectorField& g =
+        db().lookupObject<uniformDimensionedVectorField>("g");
 
     operator==
     (
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 07dbcdbe7ef3665a01201daf4eb7cf31bb0bb405..b6ab574d1db86efb7a7127f572613ddfa49f7d3a 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -59,7 +59,7 @@ Foam::spray::spray
     const basicMultiComponentMixture& composition,
     const PtrList<gasThermoPhysics>& gasProperties,
     const dictionary&,
-    const dictionary& environmentalProperties
+    const dimensionedVector& g
 )
 :
     Cloud<parcel>(U.mesh(), false), // suppress className checking on positions
@@ -181,7 +181,7 @@ Foam::spray::spray
     ),
 
     subCycles_(readLabel(sprayProperties_.lookup("subCycles"))),
-    g_(dimensionedVector(environmentalProperties.lookup("g")).value()),
+    g_(g.value()),
 
     gasProperties_(gasProperties),
     composition_(composition),
@@ -266,7 +266,7 @@ Foam::spray::spray
                 "const volScalarField& T, const combustionMixture& composition,"
                 "const PtrList<gasThermoPhsyics>& gaseousFuelProperties, "
                 "const dictionary& thermophysicalProperties, "
-                "const dictionary& environmentalProperties)"
+                "const dimensionedScalar& g)"
             )   << "spray::(...) only one wedgePolyPatch found. "
                    "Please check you BC-setup."
                 << abort(FatalError);
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 044423fc752ecbfa5b353c1f687b1be392419312..27ec6a43ec4e4bcce0ec5f5659d101e4a18f539d 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -122,7 +122,7 @@ class spray
 
 
         //- Acceleration due to gravity
-        vector g_;
+        const vector& g_;
 
 
         // Composition properties
@@ -195,7 +195,7 @@ public:
             const basicMultiComponentMixture& composition,
             const PtrList<gasThermoPhysics>& gasProperties,
             const dictionary& thermophysicalProperties,
-            const dictionary& environmentalProperties
+            const dimensionedVector& g
         );
 
 
diff --git a/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index c158c8b2ba8efedd162b51d53e95250ea819249e..6c73d638f8b50cfb2ced7bb0f129e546dcf2e2d7 100644
--- a/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -29,6 +29,7 @@ License
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "surfaceFields.H"
+#include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -140,10 +141,8 @@ void Foam::alphaFixedPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const dictionary& environmentalProperties
-        = db().lookupObject<IOdictionary>("environmentalProperties");
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
+    const uniformDimensionedVectorField& g =
+        db().lookupObject<uniformDimensionedVectorField>("g");
 
     const fvPatchField<scalar>& rho =
         patch().lookupPatchField<volScalarField, scalar>("rho");
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
similarity index 90%
rename from tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/g
index 1f0ea06a3cb5296cd1202223d4955977d562ca1f..22bddf9891b3c3a50b8f45801907cccf270bd937 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
@@ -11,10 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [0 1 -2 0 0 0 0] (0 0 0);
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
similarity index 90%
rename from tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
index ce7f648b7fae5d1ad1a6f0605b644e757b0728f3..e6c990ee7a969afa942967ca0e9716f7ad9d5c4b 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
similarity index 90%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
index 645c9af09920faa00dce17c1d3a52689e877a1f0..c86cc8bb1f980572f76b44209c4b883b23d0db82 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/g
similarity index 90%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/g
index d1abb1921fca674416ed8e44ebca7cd1c9d3cbd3..71a0e64789057719ce02d5375c48940943cc7e7c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      binary;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 ] ( 0 0 -9.81 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/g
similarity index 90%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
rename to tutorials/combustion/engineFoam/kivaTest/constant/g
index 645c9af09920faa00dce17c1d3a52689e877a1f0..c86cc8bb1f980572f76b44209c4b883b23d0db82 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
similarity index 90%
rename from tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
rename to tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
index 645c9af09920faa00dce17c1d3a52689e877a1f0..22bddf9891b3c3a50b8f45801907cccf270bd937 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
similarity index 90%
rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties
rename to tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
index 8ecb2a440203a35f242328826e7484e672012712..4f395927146d6c37fcda59ba9c816506171512d6 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
@@ -11,10 +11,11 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [0 1 -2 0 0 0 0] (0 0 -9.81);
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 -9.81);
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
deleted file mode 100644
index 639bd90b066ffdac881dc8722b84c1bf39170e9d..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..427e0d5515d659a26f00cb9d4eb7ac7bee57a9a4
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties
deleted file mode 100644
index 639bd90b066ffdac881dc8722b84c1bf39170e9d..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..427e0d5515d659a26f00cb9d4eb7ac7bee57a9a4
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
new file mode 100644
index 0000000000000000000000000000000000000000..4c5b83c8435ed1e68de9dfa6e1653c908e694d64
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
deleted file mode 120000
index 9cb87f2395573b73794fb16e426cc3c036882cc5..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../bottomAir/environmentalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
similarity index 84%
rename from tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties
rename to tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
index 81880398320423b6d3270e8071222fc6fc7bbec2..0125923f1ebac46d2647490db10b0a919bbf5506 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [0 1 -2 0 0 0 0] (0 0 -9.81);
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 -9.81);
 rotating true;
 Omega        Omega       [0 0 -1 0 0]  (0 0 7.292e-5);
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
similarity index 90%
rename from tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
index e5124f24528a9aefc741713cd06a11917107de2a..c9406d1b60f063a673bd776e952bddcf0bcfeb04 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
similarity index 90%
rename from tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
index e5124f24528a9aefc741713cd06a11917107de2a..6d927430326dcc73f8dfdf08681f109e6500f6e7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
similarity index 89%
rename from tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
rename to tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
index 4baaea2a25ae33b74c1a57066d6bb1db10704eea..6d927430326dcc73f8dfdf08681f109e6500f6e7 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
index 77715fd48c1905eb01642ddefb02aaac1338e0db..b20e73b487ee743bf0ee6fe7a1faeb7a2243558c 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createClouds.H"
     #include "readPISOControls.H"
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
new file mode 100644
index 0000000000000000000000000000000000000000..4c5b83c8435ed1e68de9dfa6e1653c908e694d64
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties
deleted file mode 120000
index 9cb87f2395573b73794fb16e426cc3c036882cc5..0000000000000000000000000000000000000000
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../bottomAir/environmentalProperties
\ No newline at end of file
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
similarity index 89%
rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties
rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
index 938322374a12738e1c9fd6b846c4b8187e6177df..5eec6f2b2ebd835b4e4269bc9d6ca28f2fcbf6f3 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
similarity index 89%
rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties
rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
index 938322374a12738e1c9fd6b846c4b8187e6177df..5eec6f2b2ebd835b4e4269bc9d6ca28f2fcbf6f3 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties
deleted file mode 100644
index 639bd90b066ffdac881dc8722b84c1bf39170e9d..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..427e0d5515d659a26f00cb9d4eb7ac7bee57a9a4
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
similarity index 89%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
index 9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88..c6d6aa8eef27192ccd165eb2194abd6173cf0275 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..c6d6aa8eef27192ccd165eb2194abd6173cf0275
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..c6d6aa8eef27192ccd165eb2194abd6173cf0275
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..c6d6aa8eef27192ccd165eb2194abd6173cf0275
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..c6d6aa8eef27192ccd165eb2194abd6173cf0275
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C b/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
index 9f1efad337fce1be11e0728662c8980823f3ab80..9daeb8455448422e4a41215ef981d937021f99f3 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..844d7a83785572cf98f0d6357dd0f292859989f3
--- /dev/null
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 0);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict
index 2de344506d223ab76e1bb8cc7b273c285b37d5a3..fed2eb2f6e0b3e8981e2b585cc18a3df0b2a9514 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict
@@ -18,7 +18,6 @@ FoamFile
 defaultFieldValues
 (
     volScalarFieldValue alpha1 0
-    volVectorFieldValue U (0 0 0)
 );
 
 regions
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
index 3a6342293a65ea0926ba2905f85f1d656a0d0064..41c06d5f3f4d03c47e0a53a8d3008451786eda15 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
index d719028fc537ebf98817f8160bf703a6cd95c8eb..cd4857c7eb7a702974ee3e1c9f99a93c3365e7a4 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
@@ -18,7 +18,6 @@ FoamFile
 defaultFieldValues
 (
     volScalarFieldValue alpha1 0
-    volVectorFieldValue U (0 0 0)
 );
 
 regions
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..c86cc8bb1f980572f76b44209c4b883b23d0db82
--- /dev/null
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/g b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
index d719028fc537ebf98817f8160bf703a6cd95c8eb..cd4857c7eb7a702974ee3e1c9f99a93c3365e7a4 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
@@ -18,7 +18,6 @@ FoamFile
 defaultFieldValues
 (
     volScalarFieldValue alpha1 0
-    volVectorFieldValue U (0 0 0)
 );
 
 regions
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties
deleted file mode 100644
index 938322374a12738e1c9fd6b846c4b8187e6177df..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..5eec6f2b2ebd835b4e4269bc9d6ca28f2fcbf6f3
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
similarity index 90%
rename from tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
index b5ad4b1cfd6a3ca2480b62a561d7bade6452f875..03586845f30500f56eb41616b2d526d1bd08d826 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      binary;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
deleted file mode 100644
index 6a8eb74fb89ac0cc0bb440deb759d62087efe497..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd799e63d2d6946a66cf3da14d092bd..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..22bddf9891b3c3a50b8f45801907cccf270bd937
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //