diff --git a/applications/solvers/DNS/dnsFoam/createFields.H b/applications/solvers/DNS/dnsFoam/createFields.H
index 5db1728137..2d2b832d07 100644
--- a/applications/solvers/DNS/dnsFoam/createFields.H
+++ b/applications/solvers/DNS/dnsFoam/createFields.H
@@ -30,6 +30,6 @@ volVectorField U
 
 #include "createPhi.H"
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 #include "readTurbulenceProperties.H"
diff --git a/applications/solvers/basic/potentialFoam/createControls.H b/applications/solvers/basic/potentialFoam/createControls.H
index 7015cae02e..f3a35402e7 100644
--- a/applications/solvers/basic/potentialFoam/createControls.H
+++ b/applications/solvers/basic/potentialFoam/createControls.H
@@ -1,6 +1,6 @@
 const dictionary& potentialFlow
 (
-    mesh.solutionDict().subDict("potentialFlow")
+    mesh.solution().dict().subDict("potentialFlow")
 );
 
 const int nNonOrthCorr
diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index 677fbad923..8e2edecb99 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -111,6 +111,6 @@ setRefCell
     PhiRefCell,
     PhiRefValue
 );
-mesh.setFluxRequired(Phi.name());
+mesh.schemes().setFluxRequired(Phi.name());
 
 #include "createMRF.H"
diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/bEqn.H b/applications/solvers/combustion/XiFoam/PDRFoam/bEqn.H
index 7a79feda4a..bee9c5e682 100644
--- a/applications/solvers/combustion/XiFoam/PDRFoam/bEqn.H
+++ b/applications/solvers/combustion/XiFoam/PDRFoam/bEqn.H
@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
         mesh,
         fields,
         phi,
-        mesh.divScheme("div(phi,ft_b_ha_hau)")
+        mesh.schemes().div("div(phi,ft_b_ha_hau)")
     )
 );
 
diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H b/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H
index d43f864769..4b40b201dd 100644
--- a/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H
@@ -43,7 +43,7 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::RASModel> turbulence
diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H
index 243026ee67..05799e004d 100644
--- a/applications/solvers/combustion/XiFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/createFields.H
@@ -44,7 +44,7 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::momentumTransportModel> turbulence
diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H
index dd06214bac..c8a1e82633 100644
--- a/applications/solvers/combustion/XiFoam/ftEqn.H
+++ b/applications/solvers/combustion/XiFoam/ftEqn.H
@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
         mesh,
         fields,
         phi,
-        mesh.divScheme("div(phi,ft_b_ha_hau)")
+        mesh.schemes().div("div(phi,ft_b_ha_hau)")
     )
 );
 
diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H
index 676b223269..e9eb43a66e 100644
--- a/applications/solvers/combustion/reactingFoam/YEqn.H
+++ b/applications/solvers/combustion/reactingFoam/YEqn.H
@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
         mesh,
         fields,
         phi,
-        mesh.divScheme("div(phi,Yi_h)")
+        mesh.schemes().div("div(phi,Yi_h)")
     )
 );
 
diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H
index 1ddaff17c5..03d1242559 100644
--- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H
@@ -39,7 +39,7 @@ volScalarField& p = thermo.p();
 
 #include "compressibleCreatePhi.H"
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 Info << "Creating turbulence model.\n" << nl;
 autoPtr<compressible::momentumTransportModel> turbulence
@@ -94,7 +94,7 @@ pressureReference pressureReference
     thermo.incompressible()
 );
 
-mesh.setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
 
 hydrostaticInitialisation
 (
diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
index 3c8bb933c7..550218921d 100644
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@@ -40,7 +40,7 @@ volScalarField& p = thermo.p();
 
 pressureReference pressureReference(p, pimple.dict(), false);
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 
 Info << "Creating turbulence model.\n" << nl;
diff --git a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
index e8c28d65c2..4cba5629f7 100644
--- a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
+++ b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
@@ -1,5 +1,5 @@
 word fluxScheme("Kurganov");
-if (mesh.schemesDict().readIfPresent("fluxScheme", fluxScheme))
+if (mesh.schemes().dict().readIfPresent("fluxScheme", fluxScheme))
 {
     if ((fluxScheme == "Tadmor") || (fluxScheme == "Kurganov"))
     {
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index f61d2cb9e6..7d41857c7c 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -47,7 +47,7 @@ pressureReference pressureReference
     thermo.incompressible()
 );
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::momentumTransportModel> turbulence
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 81676f5fa7..2bb87a7f7f 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -95,7 +95,7 @@ if (pimple.transonic())
 }
 else
 {
-    if (mesh.steady())
+    if (mesh.schemes().steady())
     {
         adjustMass = adjustPhi(phiHbyA, U, p);
     }
@@ -133,7 +133,7 @@ else
     }
 }
 
-if (mesh.steady())
+if (mesh.schemes().steady())
 {
     #include "incompressible/continuityErrs.H"
 }
@@ -161,7 +161,7 @@ U.correctBoundaryConditions();
 fvConstraints.constrain(U);
 K = 0.5*magSqr(U);
 
-if (mesh.steady())
+if (mesh.schemes().steady())
 {
     fvConstraints.constrain(p);
 }
@@ -175,7 +175,7 @@ if (adjustMass && !thermo.incompressible())
     p.correctBoundaryConditions();
 }
 
-if (mesh.steady() || pimple.simpleRho() || adjustMass)
+if (mesh.schemes().steady() || pimple.simpleRho() || adjustMass)
 {
     rho = thermo.rho();
 }
@@ -183,7 +183,7 @@ if (mesh.steady() || pimple.simpleRho() || adjustMass)
 // Correct rhoUf if the mesh is moving
 fvc::correctRhoUf(rhoUf, rho, U, phi);
 
-if (mesh.steady() || pimple.simpleRho())
+if (mesh.schemes().steady() || pimple.simpleRho())
 {
     rho.relax();
 }
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index abc81f250e..109697e70b 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
 
             if
             (
-                !mesh.steady()
+                !mesh.schemes().steady()
              && !pimple.simpleRho()
              && pimple.firstPimpleIter()
             )
@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        if (!mesh.steady())
+        if (!mesh.schemes().steady())
         {
             rho = thermo.rho();
         }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 16eb73d701..7ec066bb15 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -45,7 +45,7 @@ pressureReference pressureReference
     thermo.incompressible()
 );
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::momentumTransportModel> turbulence
diff --git a/applications/solvers/electromagnetics/mhdFoam/createFields.H b/applications/solvers/electromagnetics/mhdFoam/createFields.H
index 9652764703..d4d7e88906 100644
--- a/applications/solvers/electromagnetics/mhdFoam/createFields.H
+++ b/applications/solvers/electromagnetics/mhdFoam/createFields.H
@@ -111,5 +111,5 @@ DBU.name() = "DBU";
 
 pressureReference pressureReference(p, piso.dict());
 
-mesh.setFluxRequired(p.name());
-mesh.setFluxRequired(pB.name());
+mesh.schemes().setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(pB.name());
diff --git a/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H b/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H
index 7f280b8aa3..0a5d43a90a 100644
--- a/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H
+++ b/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H
@@ -1,3 +1,3 @@
-    const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO");
+    const dictionary& Bpiso = mesh.solution().dict().subDict("BPISO");
 
     const int nBcorr = Bpiso.lookupOrDefault<int>("nCorrectors", 1);
diff --git a/applications/solvers/heatTransfer/buoyantFoam/createFields.H b/applications/solvers/heatTransfer/buoyantFoam/createFields.H
index 8f04e6367c..3962547731 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantFoam/createFields.H
@@ -84,7 +84,7 @@ pressureReference pressureReference
     thermo.incompressible()
 );
 
-mesh.setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
 
 hydrostaticInitialisation
 (
diff --git a/applications/solvers/heatTransfer/buoyantFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantFoam/pEqn.H
index 1e3497e755..30afc8f5a8 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantFoam/pEqn.H
@@ -23,7 +23,7 @@ surfaceScalarField phiHbyA
 
 MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
-bool adjustMass = mesh.steady() && adjustPhi(phiHbyA, U, p_rgh);
+bool adjustMass = mesh.schemes().steady() && adjustPhi(phiHbyA, U, p_rgh);
 
 const surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
@@ -97,7 +97,7 @@ else
 
 phi = phiHbyA + p_rghEqn.flux();
 
-if (mesh.steady())
+if (mesh.schemes().steady())
 {
     #include "incompressible/continuityErrs.H"
 }
@@ -131,7 +131,7 @@ U.correctBoundaryConditions();
 fvConstraints.constrain(U);
 K = 0.5*magSqr(U);
 
-if (mesh.steady())
+if (mesh.schemes().steady())
 {
     if (fvConstraints.constrain(p))
     {
@@ -150,12 +150,12 @@ if (adjustMass && !thermo.incompressible())
     p_rgh.correctBoundaryConditions();
 }
 
-if (mesh.steady() || pimple.simpleRho() || adjustMass)
+if (mesh.schemes().steady() || pimple.simpleRho() || adjustMass)
 {
     rho = thermo.rho();
 }
 
-if (mesh.steady() || pimple.simpleRho())
+if (mesh.schemes().steady() || pimple.simpleRho())
 {
     rho.relax();
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H
index c50805725f..2c0e98c2a7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H
@@ -7,7 +7,7 @@ if (Y.size())
             mesh,
             fields,
             phi,
-            mesh.divScheme("div(phi,Yi_h)")
+            mesh.schemes().div("div(phi,Yi_h)")
         )
     );
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index 1be5924d42..a81580cee8 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -214,7 +214,7 @@ forAll(fluidRegions, i)
         )
     );
 
-    fluidRegions[i].setFluxRequired(p_rghFluid[i].name());
+    fluidRegions[i].schemes().setFluxRequired(p_rghFluid[i].name());
 
     initialMassFluid[i] = fvc::domainIntegrate(rhoFluid[i]).value();
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
index 3a544ccd1c..cdcd5641b9 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
@@ -20,7 +20,7 @@ else
 {
     if (Ecorr == 0)
     {
-        if (!mesh.steady() && pimples.firstPimpleIter())
+        if (!mesh.schemes().steady() && pimples.firstPimpleIter())
         {
             #include "rhoEqn.H"
         }
@@ -61,7 +61,7 @@ else
             thermophysicalTransport.correct();
         }
 
-        if (!mesh.steady() && pimples.finalPimpleIter())
+        if (!mesh.schemes().steady() && pimples.finalPimpleIter())
         {
             rho = thermo.rho();
         }
diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
index 323673abcb..1ceb6bf73b 100644
--- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
+++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nEvolving thermodynamics\n" << endl;
 
-    if (mesh.solutionDict().found("SIMPLE"))
+    if (mesh.solution().dict().found("SIMPLE"))
     {
         simpleControl simple(mesh);
 
diff --git a/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
index 69c474534b..2b678f246b 100644
--- a/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
         //    mesh.relaxationFactor("alpha")
         //   *(lambda*max(Ua & U, zeroSensitivity) - alpha);
         alpha +=
-            mesh.fieldRelaxationFactor("alpha")
+            mesh.solution().fieldRelaxationFactor("alpha")
            *(min(max(alpha + lambda*(Ua & U), zeroAlpha), alphaMax) - alpha);
 
         zeroCells(alpha, inletCells);
diff --git a/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H
index 6873aaa984..912ba97537 100644
--- a/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H
+++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H
@@ -31,7 +31,7 @@ volVectorField U
 
 pressureReference pressureReference(p, simple.dict());
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 
 Info<< "Reading field pa\n" << endl;
@@ -74,7 +74,7 @@ setRefCell
     paRefCell,
     paRefValue
 );
-mesh.setFluxRequired(pa.name());
+mesh.schemes().setFluxRequired(pa.name());
 
 
 autoPtr<viscosityModel> viscosity(viscosityModel::New(mesh));
diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H
index 89a19b02d0..fdc325c7ff 100644
--- a/applications/solvers/incompressible/icoFoam/createFields.H
+++ b/applications/solvers/incompressible/icoFoam/createFields.H
@@ -54,5 +54,5 @@ volVectorField U
 
 label pRefCell = 0;
 scalar pRefValue = 0.0;
-setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
-mesh.setFluxRequired(p.name());
+setRefCell(p, mesh.solution().dict().subDict("PISO"), pRefCell, pRefValue);
+mesh.schemes().setFluxRequired(p.name());
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
index 30b52c405e..94c7aaba32 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
@@ -41,7 +41,7 @@ surfaceScalarField phi
 );
 
 pressureReference pressureReference(p, pimple.dict());
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 Info<< "Creating SRF model\n" << endl;
 autoPtr<SRF::SRFModel> SRF
diff --git a/applications/solvers/incompressible/pimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/createFields.H
index ac1fb35a82..6565b06495 100644
--- a/applications/solvers/incompressible/pimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleFoam/createFields.H
@@ -32,7 +32,7 @@ volVectorField U
 
 pressureReference pressureReference(p, pimple.dict());
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 
 autoPtr<viscosityModel> viscosity(viscosityModel::New(mesh));
diff --git a/applications/solvers/incompressible/pisoFoam/createFields.H b/applications/solvers/incompressible/pisoFoam/createFields.H
index 55be24f058..a54c6bd72a 100644
--- a/applications/solvers/incompressible/pisoFoam/createFields.H
+++ b/applications/solvers/incompressible/pisoFoam/createFields.H
@@ -31,7 +31,7 @@ volVectorField U
 
 pressureReference pressureReference(p, piso.dict());
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 
 autoPtr<viscosityModel> viscosity(viscosityModel::New(mesh));
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createFields.H b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
index a6f31de91f..d15ac864c1 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/createFields.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
@@ -76,4 +76,4 @@ hTotal.write();
 Info<< "Creating Coriolis Force" << endl;
 const dimensionedVector F("F", ((2.0*Omega) & gHat)*gHat);
 
-mesh.setFluxRequired(h.name());
+mesh.schemes().setFluxRequired(h.name());
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
index c9262e6f6f..62a3ee0fec 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
@@ -42,7 +42,7 @@ surfaceScalarField phi
 
 pressureReference pressureReference(p, simple.dict());
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 Info<< "Creating SRF model\n" << endl;
 autoPtr<SRF::SRFModel> SRF(SRF::SRFModel::New(Urel));
diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H
index a78582362f..f29e7bdaa9 100644
--- a/applications/solvers/incompressible/simpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/createFields.H
@@ -30,7 +30,7 @@ volVectorField U
 
 pressureReference pressureReference(p, simple.dict());
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 autoPtr<viscosityModel> viscosity(viscosityModel::New(mesh));
 
diff --git a/applications/solvers/lagrangian/denseParticleFoam/createFields.H b/applications/solvers/lagrangian/denseParticleFoam/createFields.H
index 1267eb73e8..2ae4203624 100644
--- a/applications/solvers/lagrangian/denseParticleFoam/createFields.H
+++ b/applications/solvers/lagrangian/denseParticleFoam/createFields.H
@@ -61,7 +61,7 @@ surfaceScalarField phic
 
 pressureReference pressureReference(p, pimple.dict());
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 
@@ -127,7 +127,7 @@ parcelCloudList clouds(rhoc, Uc, muc, g);
 // Particle fraction upper limit
 scalar alphacMin
 (
-    1 - mesh.solverDict(alphac.name()).lookup<scalar>("max")
+    1 - mesh.solution().solverDict(alphac.name()).lookup<scalar>("max")
 );
 
 // Update alphac from the particle locations
diff --git a/applications/solvers/multiphase/cavitatingFoam/correctPhi.H b/applications/solvers/multiphase/cavitatingFoam/correctPhi.H
index cf3aa9351d..5f6df74e8e 100644
--- a/applications/solvers/multiphase/cavitatingFoam/correctPhi.H
+++ b/applications/solvers/multiphase/cavitatingFoam/correctPhi.H
@@ -22,7 +22,7 @@ correctUphiBCs(U, phi, true);
     surfaceScalarField rhof(fvc::interpolate(rho, "div(phi,rho)"));
     dimensionedScalar rAUf("rAUf", dimTime, 1.0);
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemes().setFluxRequired(pcorr.name());
 
     while (pimple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H
index 1ee1bee564..4757e9bbb3 100644
--- a/applications/solvers/multiphase/cavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -43,7 +43,7 @@ volVectorField U
 
 #include "createPhi.H"
 
-mesh.setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(p.name());
 
 // Mass flux (corrected by rhoEqn.H)
 surfaceScalarField rhoPhi
@@ -86,8 +86,8 @@ rho == max
     rhoMin
 );
 
-mesh.setFluxRequired(p.name());
-mesh.setFluxRequired(rho.name());
+mesh.schemes().setFluxRequired(p.name());
+mesh.schemes().setFluxRequired(rho.name());
 
 // Create incompressible turbulence model
 autoPtr<incompressible::momentumTransportModel> turbulence
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index c0ba183d4a..cc4415c4a4 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -48,8 +48,8 @@ dimensionedScalar pMin
     mixture
 );
 
-mesh.setFluxRequired(p_rgh.name());
-mesh.setFluxRequired(alpha1.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(alpha1.name());
 
 
 #include "readGravitationalAcceleration.H"
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C
index fcad65430e..0d93c5be8f 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C
@@ -332,7 +332,7 @@ void Foam::compressibleMultiphaseMixture::solve()
 {
     const Time& runTime = mesh_.time();
 
-    const dictionary& alphaControls = mesh_.solverDict("alpha");
+    const dictionary& alphaControls = mesh_.solution().solverDict("alpha");
     label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
     scalar cAlpha(alphaControls.lookup<scalar>("cAlpha"));
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
index c8b8b194ef..deeb14156a 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
@@ -35,7 +35,7 @@ const volScalarField& rho = mixture.rho();
 
 dimensionedScalar pMin("pMin", dimPressure, mixture);
 
-mesh.setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
 
 
 #include "readGravitationalAcceleration.H"
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H b/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
index 852ffd63d9..db41966855 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
@@ -1,4 +1,4 @@
-const dictionary& alphaControls = mesh.solverDict(alpha1.name());
+const dictionary& alphaControls = mesh.solution().solverDict(alpha1.name());
 
 label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H
index 70de4f935b..850539f408 100644
--- a/applications/solvers/multiphase/driftFluxFoam/createFields.H
+++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H
@@ -103,8 +103,8 @@ if (p_rgh.needReference())
     p_rgh = p - rho*gh;
 }
 
-mesh.setFluxRequired(p_rgh.name());
-mesh.setFluxRequired(alpha1.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(alpha1.name());
 
 // MULES Correction
 tmp<surfaceScalarField> talphaPhiCorr0;
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index 12e1454352..f6df0992ca 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -87,10 +87,10 @@ if (p_rgh.needReference())
     p_rgh = p - rho*gh;
 }
 
-mesh.setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
 
 volScalarField& alpha1(mixture.alpha1());
-mesh.setFluxRequired(alpha1.name());
+mesh.schemes().setFluxRequired(alpha1.name());
 
 
 #include "createAlphaFluxes.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
index ebab6a2fcd..3bb265c343 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
@@ -1,4 +1,4 @@
-const dictionary& alphaControls = mesh.solverDict(alpha1.name());
+const dictionary& alphaControls = mesh.solution().solverDict(alpha1.name());
 
 label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
index 1d149b65e1..29db185128 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
@@ -113,8 +113,8 @@ if (p_rgh.needReference())
     p_rgh = p - rho*gh;
 }
 
-mesh.setFluxRequired(p_rgh.name());
-mesh.setFluxRequired(alpha2.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(alpha2.name());
 
 #include "createMRF.H"
 #include "createFvModels.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
index 81fccc6136..21e92d01b3 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,7 +154,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
     mixture_(mixture),
     cAlpha_
     (
-        mixture.U().mesh().solverDict
+        mixture.U().mesh().solution().solverDict
         (
             mixture_.alpha1().name()
         ).lookup<scalar>("cAlpha")
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/createFields.H
index 546576ed06..21e3b92213 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/createFields.H
@@ -62,7 +62,7 @@ if (p_rgh.needReference() && fluid.incompressible())
 
 p_rgh = p - fluid.rho()*gh;
 
-mesh.setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
 
 PtrList<volScalarField> rAUs;
 PtrList<surfaceScalarField> rAUfs;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index 6274a06e01..fc132ac403 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -836,7 +836,7 @@ bool Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::
 implicitPhasePressure(const phaseModel& phase) const
 {
     return
-        this->mesh_.solverDict(phase.volScalarField::name()).
+        this->mesh_.solution().solverDict(phase.volScalarField::name()).
         template lookupOrDefault<Switch>
         (
             "implicitPhasePressure",
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index 94b91c0d5d..887cc5134b 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -609,7 +609,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctInterfaceThermo()
                 << endl;
 
             const scalar dmdtfRelax =
-                this->mesh().fieldRelaxationFactor(dmdtf.member());
+                this->mesh().solution().fieldRelaxationFactor(dmdtf.member());
 
             dmdtf = (1 - dmdtfRelax)*dmdtf + dmdtfRelax*dmdtfNew;
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C
index ec57bc6f77..147fdae683 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C
@@ -28,6 +28,7 @@ License
 #include "sinteringModel.H"
 #include "fvm.H"
 #include "fvcDdt.H"
+#include "fvcDiv.H"
 #include "mixedFvPatchField.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -204,8 +205,8 @@ void Foam::diameterModels::shapeModels::fractal::correct()
 
     fvScalarMatrix kappaEqn
     (
-        fvm::ddt(alpha, fi, kappa_)
-      + fvm::div(fAlphaPhi, kappa_)
+        fvm::ddt(alpha, fi, kappa_) + fvm::div(fAlphaPhi, kappa_)
+      - fvm::Sp(fvc::ddt(alpha, fi) + fvc::div(fAlphaPhi), kappa_)
       ==
       - sinteringModel_->R()
       + Su_
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C
index 8b169e1b16..810234d907 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C
@@ -224,7 +224,8 @@ void Foam::diameterModels::velocityGroup::correct()
 
         if
         (
-            phase().mesh().solverDict(popBalName_).lookupOrDefault<Switch>
+            phase().mesh().solution().solverDict(popBalName_)
+           .lookupOrDefault<Switch>
             (
                 "scale",
                 true
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index d5189d2ac0..bd840684f8 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -335,7 +335,7 @@ Foam::phaseSystem::phaseSystem
     forAll(phases(), phasei)
     {
         const volScalarField& alphai = phases()[phasei];
-        mesh_.setFluxRequired(alphai.name());
+        mesh_.schemes().setFluxRequired(alphai.name());
     }
 }
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C
index 2fe3c51142..2eea39f2a5 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C
@@ -47,7 +47,7 @@ void Foam::phaseSystem::solve
     const PtrList<surfaceScalarField>& rAUfs
 )
 {
-    const dictionary& alphaControls = mesh_.solverDict("alpha");
+    const dictionary& alphaControls = mesh_.solution().solverDict("alpha");
 
     const label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
     const label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C
index 5261cca161..d22e0da081 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C
@@ -33,6 +33,7 @@ License
 #include "surfaceTensionModel.H"
 #include "fvm.H"
 #include "fvcDdt.H"
+#include "fvcDiv.H"
 #include "shapeModel.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -1036,7 +1037,7 @@ void Foam::diameterModels::populationBalanceModel::solve()
     {
         const label nCorr = this->nCorr();
         const scalar tolerance =
-            mesh_.solverDict(name_).lookup<scalar>("tolerance");
+            mesh_.solution().solverDict(name_).lookup<scalar>("tolerance");
 
         if (nCorr > 0)
         {
@@ -1070,8 +1071,8 @@ void Foam::diameterModels::populationBalanceModel::solve()
 
                 fvScalarMatrix sizeGroupEqn
                 (
-                    fvm::ddt(alpha, fi)
-                  + fvm::div(phase.alphaPhi(), fi)
+                    fvm::ddt(alpha, fi) + fvm::div(phase.alphaPhi(), fi)
+                  - fvm::Sp(fvc::ddt(alpha) + fvc::div(phase.alphaPhi()), fi)
                 ==
                     Su_[i]
                   - fvm::Sp(Sp_[i], fi)
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H
index c507f7f31d..f38dd139e8 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H
@@ -29,7 +29,7 @@ inline Foam::label
 Foam::diameterModels::populationBalanceModel::sourceUpdateInterval() const
 {
     return
-        mesh_.solverDict(name_)
+        mesh_.solution().solverDict(name_)
        .lookupOrDefault<label>("sourceUpdateInterval", 1);
 }
 
@@ -59,7 +59,7 @@ Foam::diameterModels::populationBalanceModel::dict() const
 
 inline Foam::label Foam::diameterModels::populationBalanceModel::nCorr() const
 {
-    return mesh_.solverDict(name_).lookup<label>("nCorr");
+    return mesh_.solution().solverDict(name_).lookup<label>("nCorr");
 }
 
 
@@ -67,7 +67,7 @@ inline Foam::Switch
 Foam::diameterModels::populationBalanceModel::solveOnFinalIterOnly() const
 {
     return
-        mesh_.solverDict(name_).lookupOrDefault<bool>
+        mesh_.solution().solverDict(name_).lookupOrDefault<bool>
         (
             "solveOnFinalIterOnly",
             false
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
index 54c8094faf..95b4831cab 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
@@ -83,7 +83,7 @@ if (p_rgh.needReference())
     p_rgh = p - rho*gh;
 }
 
-mesh.setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
 
 #include "createMRF.H"
 #include "createFvModels.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index fd981e55b8..aed2795e1c 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -303,7 +303,7 @@ void Foam::multiphaseMixture::solve()
 
     volScalarField& alpha = phases_.first();
 
-    const dictionary& alphaControls = mesh_.solverDict("alpha");
+    const dictionary& alphaControls = mesh_.solution().solverDict("alpha");
     label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
     scalar cAlpha(alphaControls.lookup<scalar>("cAlpha"));
 
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
index a47551f887..b06e8ae63a 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
@@ -73,7 +73,7 @@ p_gh =  p - (g & mesh.C());
 
 pressureReference pressureReference(p_gh, pimple.dict());
 
-mesh.setFluxRequired(p_gh.name());
+mesh.schemes().setFluxRequired(p_gh.name());
 
 #include "createMRF.H"
 #include "createFvModels.H"
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
index 815d207446..23859dafe6 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
@@ -1,3 +1,3 @@
-const dictionary& alphaControls = mesh.solverDict(alpha1.name());
+const dictionary& alphaControls = mesh.solution().solverDict(alpha1.name());
 
 label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index d7cc5b244e..5b5befacbc 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -102,5 +102,5 @@ if (p_rgh.needReference())
     p_rgh = p - rho*gh;
 }
 
-mesh.setFluxRequired(p_rgh.name());
-mesh.setFluxRequired(alpha1.name());
+mesh.schemes().setFluxRequired(p_rgh.name());
+mesh.schemes().setFluxRequired(alpha1.name());
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H
index edd35297d5..f2f9faafa5 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H
@@ -1,3 +1,4 @@
-const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
+const dictionary& stressControl =
+    mesh.solution().dict().subDict("stressAnalysis");
 
 Switch compactNormalStress(stressControl.lookup("compactNormalStress"));
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
index b68905fd12..e3fb8bb8d3 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
@@ -51,7 +51,7 @@ else
     divSigmaExp -= fvc::div((2*mu + lambda)*fvc::grad(D), "div(sigmaD)");
 }
 
-mesh.setFluxRequired(D.name());
+mesh.schemes().setFluxRequired(D.name());
 
 #include "createFvModels.H"
 #include "createFvConstraints.H"
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H
index 79c395806e..c9066fc729 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H
@@ -1,6 +1,6 @@
 {
     const dictionary& stressControl =
-        mesh.solutionDict().subDict("stressAnalysis");
+        mesh.solution().dict().subDict("stressAnalysis");
 
     nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
     convergenceTolerance = stressControl.lookup<scalar>("D");
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
index e695c2ee5a..701c98744b 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
@@ -1,5 +1,5 @@
 const scalar accFac
 (
-    mesh.solutionDict().subDict("stressAnalysis")
+    mesh.solution().dict().subDict("stressAnalysis")
    .lookup<scalar>("accelerationFactor")
 );
diff --git a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
index c66625e20e..c650d78bae 100644
--- a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
+++ b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,18 +112,6 @@ int main(int argc, char *argv[])
             mesh
         )
     );
-    // For convenience create any fv* files
-    if (!exists(scMesh().fvSolution::objectPath()))
-    {
-        mkDir(scMesh().fvSolution::path());
-        ln("../fvSolution", scMesh().fvSolution::objectPath());
-    }
-    if (!exists(scMesh().fvSchemes::objectPath()))
-    {
-        mkDir(scMesh().fvSolution::path());
-        ln("../fvSchemes", scMesh().fvSchemes::objectPath());
-    }
-
 
     forAll(timeDirs, timeI)
     {
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 6dc85d14cb..5b93532c2f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -521,6 +521,25 @@ dimensioned<Type> DimensionedField<Type, GeoMesh>::weightedAverage
 }
 
 
+template<class Type, class GeoMesh>
+void DimensionedField<Type, GeoMesh>::reset
+(
+    const DimensionedField<Type, GeoMesh>& df
+)
+{
+    // Check for assignment to self
+    if (this == &df)
+    {
+        FatalErrorInFunction
+            << "attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    dimensions_ = df.dimensions();
+    Field<Type>::operator=(df);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh>
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index ca7f1eecd7..13b2bb470e 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -325,6 +325,10 @@ public:
             const tmp<DimensionedField<scalar, GeoMesh>>&
         ) const;
 
+        //- Reset the field contents to the given field
+        //  Used for mesh to mesh mapping
+        void reset(const DimensionedField<Type, GeoMesh>&);
+
 
         // Write
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 766648d7d2..1515692863 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -977,8 +977,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::~GeometricField()
 {
     this->db().cacheTemporaryObject(*this);
 
-    deleteDemandDrivenData(field0Ptr_);
-    deleteDemandDrivenData(fieldPrevIterPtr_);
+    clearOldTimes();
 }
 
 
@@ -1159,6 +1158,14 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::prevIter() const
 }
 
 
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clearOldTimes()
+{
+    deleteDemandDrivenData(field0Ptr_);
+    deleteDemandDrivenData(fieldPrevIterPtr_);
+}
+
+
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::
 correctBoundaryConditions()
@@ -1169,6 +1176,21 @@ correctBoundaryConditions()
 }
 
 
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::reset
+(
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
+)
+{
+    const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
+
+    Internal::reset(gf);
+    boundaryField_ == gf.boundaryField();
+
+    tgf.clear();
+}
+
+
 template<class Type, template<class> class PatchField, class GeoMesh>
 bool Foam::GeometricField<Type, PatchField, GeoMesh>::needReference() const
 {
@@ -1215,14 +1237,20 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::relax()
             "finalIteration",
             false
         )
-     && this->mesh().relaxField(this->name() + "Final")
+     && this->mesh().solution().relaxField(this->name() + "Final")
     )
     {
-        relax(this->mesh().fieldRelaxationFactor(this->name() + "Final"));
+        relax
+        (
+            this->mesh().solution().fieldRelaxationFactor
+            (
+                this->name() + "Final"
+            )
+        );
     }
-    else if (this->mesh().relaxField(this->name()))
+    else if (this->mesh().solution().relaxField(this->name()))
     {
-        relax(this->mesh().fieldRelaxationFactor(this->name()));
+        relax(this->mesh().solution().fieldRelaxationFactor(this->name()));
     }
 }
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index d33d189e61..dfaa8c77c8 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -420,9 +420,16 @@ public:
         //- Return previous iteration field
         const GeometricField<Type, PatchField, GeoMesh>& prevIter() const;
 
+        //- Delete old time and previous iteration fields
+        void clearOldTimes();
+
         //- Correct boundary field
         void correctBoundaryConditions();
 
+        //- Reset the field contents to the given field
+        //  Used for mesh to mesh mapping
+        void reset(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
+
         //- Does the field need a reference level for solution
         bool needReference() const;
 
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index d48310aa31..12739b621a 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ Foam::solution::solution
      || (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
-        read(solutionDict());
+        read(dict());
     }
 }
 
@@ -326,7 +326,7 @@ Foam::scalar Foam::solution::equationRelaxationFactor(const word& name) const
 }
 
 
-const Foam::dictionary& Foam::solution::solutionDict() const
+const Foam::dictionary& Foam::solution::dict() const
 {
     if (found("select"))
     {
@@ -354,7 +354,7 @@ bool Foam::solution::read()
 {
     if (regIOobject::read())
     {
-        read(solutionDict());
+        read(dict());
 
         return true;
     }
diff --git a/src/OpenFOAM/matrices/solution/solution.H b/src/OpenFOAM/matrices/solution/solution.H
index e325226b4a..9db7c438bf 100644
--- a/src/OpenFOAM/matrices/solution/solution.H
+++ b/src/OpenFOAM/matrices/solution/solution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ public:
 
             //- Return the selected sub-dictionary of solvers if the "select"
             //  keyword is given, otherwise return the complete dictionary
-            const dictionary& solutionDict() const;
+            const dictionary& dict() const;
 
             //- Return the solver controls dictionary for the given field
             const dictionary& solverDict(const word& name) const;
diff --git a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
index 36347c57e6..feeec1a0ba 100644
--- a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
+++ b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::CorrectPhi
         fvc::makeAbsolute(phi, U);
     }
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemes().setFluxRequired(pcorr.name());
 
     while (pcorrControl.correctNonOrthogonal())
     {
@@ -157,7 +157,7 @@ void Foam::CorrectPhi
         pcorrTypes
     );
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemes().setFluxRequired(pcorr.name());
 
     while (pcorrControl.correctNonOrthogonal())
     {
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
index 5f2fe355f9..5533560587 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
@@ -109,7 +109,7 @@ void Foam::SRFFreestreamVelocityFvPatchVectorField::updateCoeffs()
     word ddtScheme
     (
         this->internalField().mesh()
-       .ddtScheme(this->internalField().name())
+       .schemes().ddt(this->internalField().name())
     );
 
     if (ddtScheme == fv::steadyStateDdtScheme<scalar>::typeName)
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl/pimpleControl.C
index 8e42b74d3d..7b1d747d24 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl/pimpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl/pimpleControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,14 +50,16 @@ Foam::pimpleControl::pimpleControl(fvMesh& mesh, const word& algorithmName)
     }
 
     Info<< nl << algorithmName << ": Operating solver in "
-        << (mesh.steady() ? "steady-state" : mesh.transient() ? "transient" :
+        << (mesh.schemes().steady()
+        ? "steady-state"
+        : mesh.schemes().transient() ? "transient" :
             "mixed steady-state/transient") << " mode with " << nCorrPimple_
         << " outer corrector" << (nCorrPimple_ == 1 ? "" : "s") << nl;
 
     if (nCorrPimple_ == 1)
     {
         Info<< algorithmName << ": Operating solver in "
-            << (mesh.steady() ? "SIMPLE" : "PISO") << " mode" << nl;
+            << (mesh.schemes().steady() ? "SIMPLE" : "PISO") << " mode" << nl;
     }
 
     Info<< nl << endl;
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleMultiRegionControl/pimpleMultiRegionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleMultiRegionControl/pimpleMultiRegionControl.C
index 1cb1a672a3..0de5ff3c11 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleMultiRegionControl/pimpleMultiRegionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleMultiRegionControl/pimpleMultiRegionControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,8 +87,8 @@ Foam::pimpleMultiRegionControl::pimpleMultiRegionControl
             new pimpleNoLoopControl(pimpleMeshes[i], algorithmName, *this)
         );
 
-        allSteady = allSteady && pimpleMeshes[i].steady();
-        allTransient = allTransient && pimpleMeshes[i].transient();
+        allSteady = allSteady && pimpleMeshes[i].schemes().steady();
+        allTransient = allTransient && pimpleMeshes[i].schemes().transient();
     }
 
     forAll(solidMeshes, i)
@@ -98,8 +98,8 @@ Foam::pimpleMultiRegionControl::pimpleMultiRegionControl
             new solidNoLoopControl(solidMeshes[i], algorithmName, *this)
         );
 
-        allSteady = allSteady && solidMeshes[i].steady();
-        allTransient = allTransient && solidMeshes[i].transient();
+        allSteady = allSteady && solidMeshes[i].schemes().steady();
+        allTransient = allTransient && solidMeshes[i].schemes().transient();
     }
 
     read();
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleNoLoopControl/pimpleNoLoopControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleNoLoopControl/pimpleNoLoopControl.C
index 5ac18e4f0d..99a106ecf4 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleNoLoopControl/pimpleNoLoopControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleNoLoopControl/pimpleNoLoopControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ bool Foam::pimpleNoLoopControl::read()
         dict().lookupOrDefaultBackwardsCompatible<bool>
         (
             {"simpleRho", "SIMPLErho"},
-            mesh().steady()
+            mesh().schemes().steady()
         );
 
     turbOnFinalIterOnly_ =
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/singleRegionSolutionControl/singleRegionSolutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/singleRegionSolutionControl/singleRegionSolutionControl.C
index 5bb133c861..556cd76236 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/singleRegionSolutionControl/singleRegionSolutionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/singleRegionSolutionControl/singleRegionSolutionControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ Foam::singleRegionSolutionControl::~singleRegionSolutionControl()
 
 const Foam::dictionary& Foam::singleRegionSolutionControl::dict() const
 {
-    return mesh_.solutionDict().subDict(algorithmName());
+    return mesh_.solution().dict().subDict(algorithmName());
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/singleRegionSolutionControl/singleRegionSolutionControlTemplates.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/singleRegionSolutionControl/singleRegionSolutionControlTemplates.C
index 4ecf8d9dba..320e98fd05 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/singleRegionSolutionControl/singleRegionSolutionControlTemplates.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/singleRegionSolutionControl/singleRegionSolutionControlTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ void Foam::singleRegionSolutionControl::storePrevIterTypeFields() const
 
         size_t prevIterField = fName.find("PrevIter");
 
-        if (prevIterField == word::npos && mesh_.relaxField(fName))
+        if (prevIterField == word::npos && mesh_.solution().relaxField(fName))
         {
             fld.storePrevIter();
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index e562dcbc18..1edf05adb8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,7 +180,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
 
     word ddtScheme
     (
-        mesh.ddtScheme(this->internalField().name())
+        mesh.schemes().ddt(this->internalField().name())
     );
     scalar deltaT = this->db().time().deltaTValue();
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 8dbb55f43d..3c6f35ae99 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
     vectorField& zetap = zeta.boundaryFieldRef()[patchi];
 
     // Lookup d/dt scheme from database for zeta
-    const word ddtSchemeName(zeta.mesh().ddtScheme(zeta.name()));
+    const word ddtSchemeName(zeta.mesh().schemes().ddt(zeta.name()));
     ddtSchemeType ddtScheme(ddtSchemeTypeNames_[ddtSchemeName]);
 
     // Retrieve the flux field from the database
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C
index f8f1c2ab0e..e43e85273d 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Foam::word Foam::fv::localEulerDdt::rSubDeltaTName("rSubDeltaT");
 bool Foam::fv::localEulerDdt::enabled(const fvMesh& mesh)
 {
     return
-        word(mesh.ddtScheme("default"))
+        word(mesh.schemes().ddt("default"))
      == fv::localEulerDdtScheme<scalar>::typeName;
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index 5fab8b398b..44cc92b139 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -322,7 +322,7 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
      || (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
-        read(schemesDict());
+        read(dict());
     }
 }
 
@@ -336,7 +336,7 @@ bool Foam::fvSchemes::read()
         // Clear current settings except fluxRequired
         clear();
 
-        read(schemesDict());
+        read(dict());
 
         return true;
     }
@@ -347,7 +347,7 @@ bool Foam::fvSchemes::read()
 }
 
 
-const Foam::dictionary& Foam::fvSchemes::schemesDict() const
+const Foam::dictionary& Foam::fvSchemes::dict() const
 {
     if (found("select"))
     {
@@ -360,7 +360,7 @@ const Foam::dictionary& Foam::fvSchemes::schemesDict() const
 }
 
 
-Foam::ITstream& Foam::fvSchemes::ddtScheme(const word& name) const
+Foam::ITstream& Foam::fvSchemes::ddt(const word& name) const
 {
     if (debug)
     {
@@ -379,7 +379,7 @@ Foam::ITstream& Foam::fvSchemes::ddtScheme(const word& name) const
 }
 
 
-Foam::ITstream& Foam::fvSchemes::d2dt2Scheme(const word& name) const
+Foam::ITstream& Foam::fvSchemes::d2dt2(const word& name) const
 {
     if (debug)
     {
@@ -398,7 +398,7 @@ Foam::ITstream& Foam::fvSchemes::d2dt2Scheme(const word& name) const
 }
 
 
-Foam::ITstream& Foam::fvSchemes::interpolationScheme(const word& name) const
+Foam::ITstream& Foam::fvSchemes::interpolation(const word& name) const
 {
     if (debug)
     {
@@ -421,7 +421,7 @@ Foam::ITstream& Foam::fvSchemes::interpolationScheme(const word& name) const
 }
 
 
-Foam::ITstream& Foam::fvSchemes::divScheme(const word& name) const
+Foam::ITstream& Foam::fvSchemes::div(const word& name) const
 {
     if (debug)
     {
@@ -440,7 +440,7 @@ Foam::ITstream& Foam::fvSchemes::divScheme(const word& name) const
 }
 
 
-Foam::ITstream& Foam::fvSchemes::gradScheme(const word& name) const
+Foam::ITstream& Foam::fvSchemes::grad(const word& name) const
 {
     if (debug)
     {
@@ -459,7 +459,7 @@ Foam::ITstream& Foam::fvSchemes::gradScheme(const word& name) const
 }
 
 
-Foam::ITstream& Foam::fvSchemes::snGradScheme(const word& name) const
+Foam::ITstream& Foam::fvSchemes::snGrad(const word& name) const
 {
     if (debug)
     {
@@ -478,7 +478,7 @@ Foam::ITstream& Foam::fvSchemes::snGradScheme(const word& name) const
 }
 
 
-Foam::ITstream& Foam::fvSchemes::laplacianScheme(const word& name) const
+Foam::ITstream& Foam::fvSchemes::laplacian(const word& name) const
 {
     if (debug)
     {
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
index a0613c88d8..f666a95b4e 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,21 +111,21 @@ public:
 
         // Access
 
-            const dictionary& schemesDict() const;
+            const dictionary& dict() const;
 
-            ITstream& ddtScheme(const word& name) const;
+            ITstream& ddt(const word& name) const;
 
-            ITstream& d2dt2Scheme(const word& name) const;
+            ITstream& d2dt2(const word& name) const;
 
-            ITstream& interpolationScheme(const word& name) const;
+            ITstream& interpolation(const word& name) const;
 
-            ITstream& divScheme(const word& name) const;
+            ITstream& div(const word& name) const;
 
-            ITstream& gradScheme(const word& name) const;
+            ITstream& grad(const word& name) const;
 
-            ITstream& snGradScheme(const word& name) const;
+            ITstream& snGrad(const word& name) const;
 
-            ITstream& laplacianScheme(const word& name) const;
+            ITstream& laplacian(const word& name) const;
 
             void setFluxRequired(const word& name) const;
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
index 2a6acfe849..3baced9757 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ d2dt2
     return fv::d2dt2Scheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("d2dt2(" + vf.name() + ')')
+        vf.mesh().schemes().ddt("d2dt2(" + vf.name() + ')')
     ).ref().fvcD2dt2(vf);
 }
 
@@ -65,7 +65,7 @@ d2dt2
     return fv::d2dt2Scheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("d2dt2(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().ddt("d2dt2(" + rho.name() + ',' + vf.name() + ')')
     ).ref().fvcD2dt2(rho, vf);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
index 4f75b66d95..b74a843bbe 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         mesh,
-        mesh.ddtScheme("ddt(" + dt.name() + ')')
+        mesh.schemes().ddt("ddt(" + dt.name() + ')')
     ).ref().fvcDdt(dt);
 }
 
@@ -65,7 +65,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + vf.name() + ')')
     ).ref().fvcDdt(vf);
 }
 
@@ -81,7 +81,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + rho.name() + ',' + vf.name() + ')')
     ).ref().fvcDdt(rho, vf);
 }
 
@@ -97,7 +97,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + rho.name() + ',' + vf.name() + ')')
     ).ref().fvcDdt(rho, vf);
 }
 
@@ -114,7 +114,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme
+        vf.mesh().schemes().ddt
         (
             "ddt("
           + alpha.name() + ','
@@ -135,7 +135,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         sf.mesh(),
-        sf.mesh().ddtScheme("ddt(" + sf.name() + ')')
+        sf.mesh().schemes().ddt("ddt(" + sf.name() + ')')
     ).ref().fvcDdt(sf);
 }
 
@@ -175,7 +175,7 @@ ddtCorr
     return fv::ddtScheme<Type>::New
     (
         U.mesh(),
-        U.mesh().ddtScheme("ddt(" + U.name() + ')')
+        U.mesh().schemes().ddt("ddt(" + U.name() + ')')
     ).ref().fvcDdtUfCorr(U, Uf);
 }
 
@@ -196,7 +196,7 @@ ddtCorr
     return fv::ddtScheme<Type>::New
     (
         U.mesh(),
-        U.mesh().ddtScheme("ddt(" + U.name() + ')')
+        U.mesh().schemes().ddt("ddt(" + U.name() + ')')
     ).ref().fvcDdtPhiCorr(U, phi);
 }
 
@@ -238,7 +238,7 @@ ddtCorr
     return fv::ddtScheme<Type>::New
     (
         U.mesh(),
-        U.mesh().ddtScheme("ddt(" + U.name() + ')')
+        U.mesh().schemes().ddt("ddt(" + U.name() + ')')
     ).ref().fvcDdtUfCorr(rho, U, Uf);
 }
 
@@ -260,7 +260,7 @@ ddtCorr
     return fv::ddtScheme<Type>::New
     (
         U.mesh(),
-        U.mesh().ddtScheme("ddt(" + rho.name() + ',' + U.name() + ')')
+        U.mesh().schemes().ddt("ddt(" + rho.name() + ',' + U.name() + ')')
     ).ref().fvcDdtPhiCorr(rho, U, phi);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDiv.C b/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
index a7abcccf62..a2f2cc8279 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ div
 {
     return fv::divScheme<Type>::New
     (
-        vf.mesh(), vf.mesh().divScheme(name)
+        vf.mesh(), vf.mesh().schemes().div(name)
     ).ref().fvcDiv(vf);
 }
 
@@ -163,7 +163,7 @@ div
     (
         vf.mesh(),
         flux,
-        vf.mesh().divScheme(name)
+        vf.mesh().schemes().div(name)
     ).ref().fvcDiv(flux, vf);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C b/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
index feb37b27d9..ea27734517 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ flux
     const word& name
 )
 {
-    return fvc::flux(phi, vf, vf.mesh().divScheme(name));
+    return fvc::flux(phi, vf, vf.mesh().schemes().div(name));
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
index 966004e5f4..8eb4b3f66c 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ grad
     return fv::gradScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().gradScheme(name)
+        vf.mesh().schemes().grad(name)
     )().grad(vf, name);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
index a3e953ef58..ceece1df94 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ laplacian
     return fv::laplacianScheme<Type, scalar>::New
     (
         vf.mesh(),
-        vf.mesh().laplacianScheme(name)
+        vf.mesh().schemes().laplacian(name)
     ).ref().fvcLaplacian(vf);
 }
 
@@ -201,7 +201,7 @@ laplacian
     return fv::laplacianScheme<Type, GType>::New
     (
         vf.mesh(),
-        vf.mesh().laplacianScheme(name)
+        vf.mesh().schemes().laplacian(name)
     ).ref().fvcLaplacian(gamma, vf);
 }
 
@@ -343,7 +343,7 @@ laplacian
     return fv::laplacianScheme<Type, GType>::New
     (
         vf.mesh(),
-        vf.mesh().laplacianScheme(name)
+        vf.mesh().schemes().laplacian(name)
     ).ref().fvcLaplacian(gamma, vf);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
index 615c5ab3e5..4c455a1fe0 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvc::meshPhi
     return fv::ddtScheme<vector>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + vf.name() + ')')
     ).ref().meshPhi(vf);
 }
 
@@ -52,7 +52,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvc::meshPhi
     return fv::ddtScheme<vector>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + rho.name() + ',' + vf.name() + ')')
     ).ref().meshPhi(vf);
 }
 
@@ -66,7 +66,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvc::meshPhi
     return fv::ddtScheme<vector>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + rho.name() + ',' + vf.name() + ')')
     ).ref().meshPhi(vf);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
index d08dce58ad..d555ff58f9 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ snGrad
     return fv::snGradScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().snGradScheme(name)
+        vf.mesh().schemes().snGrad(name)
     )().snGrad(vf);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
index 6b0f62c2fd..00723348c3 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ d2dt2
     return fv::d2dt2Scheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().d2dt2Scheme("d2dt2(" + vf.name() + ')')
+        vf.mesh().schemes().d2dt2("d2dt2(" + vf.name() + ')')
     ).ref().fvmD2dt2(vf);
 }
 
@@ -66,7 +66,7 @@ d2dt2
     return fv::d2dt2Scheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().d2dt2Scheme("d2dt2(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().d2dt2("d2dt2(" + rho.name() + ',' + vf.name() + ')')
     ).ref().fvmD2dt2(rho, vf);
 }
 
@@ -82,7 +82,7 @@ d2dt2
     return fv::d2dt2Scheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().d2dt2Scheme("d2dt2(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().d2dt2("d2dt2(" + rho.name() + ',' + vf.name() + ')')
     ).ref().fvmD2dt2(rho, vf);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDdt.C b/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
index 8e01a4578b..18ed56e1fa 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + vf.name() + ')')
     ).ref().fvmDdt(vf);
 }
 
@@ -78,7 +78,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + rho.name() + ',' + vf.name() + ')')
     ).ref().fvmDdt(rho, vf);
 }
 
@@ -94,7 +94,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
+        vf.mesh().schemes().ddt("ddt(" + rho.name() + ',' + vf.name() + ')')
     ).ref().fvmDdt(rho, vf);
 }
 
@@ -111,7 +111,7 @@ ddt
     return fv::ddtScheme<Type>::New
     (
         vf.mesh(),
-        vf.mesh().ddtScheme
+        vf.mesh().schemes().ddt
         (
             "ddt("
           + alpha.name() + ','
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDiv.C b/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
index e2c9be6785..0ba4eaa4c6 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ div
     (
         vf.mesh(),
         flux,
-        vf.mesh().divScheme(name)
+        vf.mesh().schemes().div(name)
     )().fvmDiv(flux, vf);
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
index 5362f997c5..663b5f60c9 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -215,7 +215,7 @@ laplacian
     return fv::laplacianScheme<Type, GType>::New
     (
         vf.mesh(),
-        vf.mesh().laplacianScheme(name)
+        vf.mesh().schemes().laplacian(name)
     ).ref().fvmLaplacian(gamma, vf);
 }
 
@@ -280,7 +280,7 @@ laplacian
     return fv::laplacianScheme<Type, GType>::New
     (
         vf.mesh(),
-        vf.mesh().laplacianScheme(name)
+        vf.mesh().schemes().laplacian(name)
     ).ref().fvmLaplacian(gamma, vf);
 }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 782bcd2bc1..a973fdfbb6 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ Foam::fv::gradScheme<Type>::grad
     typedef typename outerProduct<vector, Type>::type GradType;
     typedef GeometricField<GradType, fvPatchField, volMesh> GradFieldType;
 
-    if (!this->mesh().changing() && this->mesh().cache(name))
+    if (!this->mesh().changing() && this->mesh().solution().cache(name))
     {
         if (!mesh().objectRegistry::template foundObject<GradFieldType>(name))
         {
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
index 1e4e349576..e055d730d1 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,7 +182,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacian
 
     fvm.source() -= mesh.V()*fvc::div(tfaceFluxCorrection())().primitiveField();
 
-    if (mesh.fluxRequired(vf.name()))
+    if (mesh.schemes().fluxRequired(vf.name()))
     {
         fvm.faceFluxCorrectionPtr() = tfaceFluxCorrection.ptr();
     }
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
index 2f83f599ff..2eeaa327b0 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian         \
                                                                                \
     if (this->tsnGradScheme_().corrected())                                    \
     {                                                                          \
-        if (mesh.fluxRequired(vf.name()))                                      \
+        if (mesh.schemes().fluxRequired(vf.name()))                            \
         {                                                                      \
             fvm.faceFluxCorrectionPtr() = new                                  \
             GeometricField<Type, fvsPatchField, surfaceMesh>                   \
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
index 2d8d3ef06f..f70ba9c3c1 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ Foam::fv::correctedSnGrad<Type>::fullGradCorrection
             gradScheme<Type>::New
             (
                 mesh,
-                mesh.gradScheme("grad(" + vf.name() + ')')
+                mesh.schemes().grad("grad(" + vf.name() + ')')
             )().grad(vf, "grad(" + vf.name() + ')')
         );
     tssf.ref().rename("snGradCorr(" + vf.name() + ')');
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 18f09edb59..fa3c92bcda 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -675,14 +675,20 @@ void Foam::fvMatrix<Type>::relax()
     (
         psi_.mesh().data::template lookupOrDefault<bool>
         ("finalIteration", false)
-     && psi_.mesh().relaxEquation(psi_.name() + "Final")
+     && psi_.mesh().solution().relaxEquation(psi_.name() + "Final")
     )
     {
-        relax(psi_.mesh().equationRelaxationFactor(psi_.name() + "Final"));
+        relax
+        (
+            psi_.mesh().solution().equationRelaxationFactor
+            (
+                psi_.name() + "Final"
+            )
+        );
     }
-    else if (psi_.mesh().relaxEquation(psi_.name()))
+    else if (psi_.mesh().solution().relaxEquation(psi_.name()))
     {
-        relax(psi_.mesh().equationRelaxationFactor(psi_.name()));
+        relax(psi_.mesh().solution().equationRelaxationFactor(psi_.name()));
     }
 }
 
@@ -855,7 +861,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvMatrix<Type>::
 flux() const
 {
-    if (!psi_.mesh().fluxRequired(psi_.name()))
+    if (!psi_.mesh().schemes().fluxRequired(psi_.name()))
     {
         FatalErrorInFunction
             << "flux requested but " << psi_.name()
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index c727e91ede..e35e4d9200 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -282,11 +282,11 @@ Foam::fvMatrix<Type>::solver()
 {
     return solver
     (
-        psi_.mesh().solverDict
+        psi_.mesh().solution().solverDict
         (
             psi_.select
             (
-                !psi_.mesh().steady()
+                !psi_.mesh().schemes().steady()
              && psi_.mesh().data::template lookupOrDefault<bool>
                 ("finalIteration", false)
             )
@@ -300,11 +300,11 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::fvSolver::solve()
 {
     return solve
     (
-        fvMat_.psi_.mesh().solverDict
+        fvMat_.psi_.mesh().solution().solverDict
         (
             fvMat_.psi_.select
             (
-                !fvMat_.psi_.mesh().steady()
+                !fvMat_.psi_.mesh().schemes().steady()
              && fvMat_.psi_.mesh().data::template lookupOrDefault<bool>
                 ("finalIteration", false)
             )
@@ -318,9 +318,9 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solve(const word& name)
 {
     return solve
     (
-        psi_.mesh().solverDict
+        psi_.mesh().solution().solverDict
         (
-            !psi_.mesh().steady()
+            !psi_.mesh().schemes().steady()
          && psi_.mesh().data::template lookupOrDefault<bool>
             ("finalIteration", false)
           ? word(name + "Final")
@@ -335,11 +335,11 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solve()
 {
     return solve
     (
-        psi_.mesh().solverDict
+        psi_.mesh().solution().solverDict
         (
             psi_.select
             (
-                !psi_.mesh().steady()
+                !psi_.mesh().schemes().steady()
              && psi_.mesh().data::template lookupOrDefault<bool>
                 (
                     "finalIteration",
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index 87c533e44c..74b896ffd9 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -215,7 +215,7 @@ void Foam::MULES::limiterCorr
 
     const fvMesh& mesh = psi.mesh();
 
-    const dictionary& MULEScontrols = mesh.solverDict(psi.name());
+    const dictionary& MULEScontrols = mesh.solution().solverDict(psi.name());
 
     const label nLimiterIter
     (
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 60421e4f59..5d9a9df91c 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ void Foam::MULES::limiter
 
     const fvMesh& mesh = psi.mesh();
 
-    const dictionary& MULEScontrols = mesh.solverDict(psi.name());
+    const dictionary& MULEScontrols = mesh.solution().solverDict(psi.name());
 
     const label nLimiterIter
     (
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 7d67025999..2d46e731a5 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -256,8 +256,6 @@ Foam::fvMesh::fvMesh(const IOobject& io, const bool changers)
 :
     polyMesh(io),
     surfaceInterpolation(*this),
-    fvSchemes(static_cast<const objectRegistry&>(*this)),
-    fvSolution(static_cast<const objectRegistry&>(*this)),
     data(static_cast<const objectRegistry&>(*this)),
     boundary_(*this, boundaryMesh()),
     topoChanger_(nullptr),
@@ -354,8 +352,6 @@ Foam::fvMesh::fvMesh
         syncPar
     ),
     surfaceInterpolation(*this),
-    fvSchemes(static_cast<const objectRegistry&>(*this)),
-    fvSolution(static_cast<const objectRegistry&>(*this)),
     data(static_cast<const objectRegistry&>(*this)),
     boundary_(*this, boundaryMesh()),
     topoChanger_(nullptr),
@@ -399,8 +395,6 @@ Foam::fvMesh::fvMesh
         syncPar
     ),
     surfaceInterpolation(*this),
-    fvSchemes(static_cast<const objectRegistry&>(*this)),
-    fvSolution(static_cast<const objectRegistry&>(*this)),
     data(static_cast<const objectRegistry&>(*this)),
     boundary_(*this, boundaryMesh()),
     topoChanger_(nullptr),
@@ -435,8 +429,6 @@ Foam::fvMesh::fvMesh
 :
     polyMesh(io, move(points), move(faces), move(cells), syncPar),
     surfaceInterpolation(*this),
-    fvSchemes(static_cast<const objectRegistry&>(*this)),
-    fvSolution(static_cast<const objectRegistry&>(*this)),
     data(static_cast<const objectRegistry&>(*this)),
     boundary_(*this),
     topoChanger_(nullptr),
@@ -540,6 +532,42 @@ void Foam::fvMesh::removeFvBoundary()
 }
 
 
+void Foam::fvMesh::reset(const fvMesh& newMesh)
+{
+    // Clear the sliced fields
+    clearGeom();
+
+    // Clear the current volume and other geometry factors
+    surfaceInterpolation::clearOut();
+
+    // Clear any non-updateable addressing
+    clearAddressing(true);
+
+    // Clear mesh motion flux
+    deleteDemandDrivenData(phiPtr_);
+
+    const polyPatchList& newBoundary = newMesh.boundaryMesh();
+    labelList patchSizes(newBoundary.size());
+    labelList patchStarts(newBoundary.size());
+
+    forAll(newBoundary, patchi)
+    {
+        patchSizes[patchi] = newBoundary[patchi].size();
+        patchStarts[patchi] = newBoundary[patchi].start();
+    }
+
+    polyMesh::resetPrimitives
+    (
+        pointField(newMesh.points()),
+        faceList(newMesh.faces()),
+        labelList(newMesh.faceOwner()),
+        labelList(newMesh.faceNeighbour()),
+        patchSizes,
+        patchStarts
+    );
+}
+
+
 Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
 {
     if (debug)
@@ -1215,6 +1243,28 @@ Foam::fvMesh::validComponents<Foam::sphericalTensor>() const
 }
 
 
+const Foam::fvSchemes& Foam::fvMesh::schemes() const
+{
+    if (!fvSchemes_.valid())
+    {
+        fvSchemes_ = new fvSchemes(*this);
+    }
+
+    return fvSchemes_;
+}
+
+
+const Foam::fvSolution& Foam::fvMesh::solution() const
+{
+    if (!fvSolution_.valid())
+    {
+        fvSolution_ = new fvSolution(*this);
+    }
+
+    return fvSolution_;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 bool Foam::fvMesh::operator!=(const fvMesh& bm) const
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 2c2272eb52..7b16ec47bc 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -85,8 +85,6 @@ class fvMesh
     public polyMesh,
     public lduMesh,
     public surfaceInterpolation,
-    public fvSchemes,
-    public fvSolution,
     public data
 {
     // Private Data
@@ -138,6 +136,12 @@ class fvMesh
         //- Face motion fluxes
         mutable surfaceScalarField* phiPtr_;
 
+        //- fvSchemes created on demand
+        mutable autoPtr<fvSchemes> fvSchemes_;
+
+        //- fvSolution created on demand
+        mutable autoPtr<fvSolution> fvSolution_;
+
 
     // Private Member Functions
 
@@ -358,6 +362,12 @@ public:
             template<class Type>
             typename pTraits<Type>::labelType validComponents() const;
 
+            //- Return the fvSchemes
+            const fvSchemes& schemes() const;
+
+            //- Return the fvSchemes
+            const fvSolution& solution() const;
+
 
         // Edit
 
@@ -405,6 +415,10 @@ public:
             //  these fvPatches.
             void removeFvBoundary();
 
+            //- Reset mesh
+            //  For run-time mesh replacement and mesh to mesh mapping
+            void reset(const fvMesh&);
+
 
         // Write
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 68576643cd..b7d689501f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
 
     const word limiterFieldName(type() + "Limiter(" + phi.name() + ')');
 
-    if (this->mesh().cache("limiter"))
+    if (this->mesh().solution().cache("limiter"))
     {
         if (!mesh.foundObject<surfaceScalarField>(limiterFieldName))
         {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index aca4c1f15f..71f1743285 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ Foam::linearUpwind<Type>::correction
         fv::gradScheme<scalar>::New
         (
             mesh,
-            mesh.gradScheme(gradSchemeName_)
+            mesh.schemes().grad(gradSchemeName_)
         )
     );
 
@@ -165,7 +165,7 @@ Foam::linearUpwind<Foam::vector>::correction
         fv::gradScheme<vector>::New
         (
             mesh,
-            mesh.gradScheme(gradSchemeName_)
+            mesh.schemes().grad(gradSchemeName_)
         )
     );
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
index ed6bc1c6de..3646b45c75 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ public:
                 fv::gradScheme<Type>::New
                 (
                     mesh,
-                    mesh.gradScheme(gradSchemeName_)
+                    mesh.schemes().grad(gradSchemeName_)
                 )
             )
         {}
@@ -118,7 +118,7 @@ public:
                 fv::gradScheme<Type>::New
                 (
                     mesh,
-                    mesh.gradScheme(gradSchemeName_)
+                    mesh.schemes().grad(gradSchemeName_)
                 )
             )
         {}
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
index 38a48923a5..1b668b6b43 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ Foam::tmp<Foam::surfaceInterpolationScheme<Type>> Foam::fvc::scheme
     (
         faceFlux.mesh(),
         faceFlux,
-        faceFlux.mesh().interpolationScheme(name)
+        faceFlux.mesh().schemes().interpolation(name)
     );
 }
 
@@ -85,7 +85,7 @@ Foam::tmp<Foam::surfaceInterpolationScheme<Type>> Foam::fvc::scheme
     return surfaceInterpolationScheme<Type>::New
     (
         mesh,
-        mesh.interpolationScheme(name)
+        mesh.schemes().interpolation(name)
     );
 }
 
diff --git a/src/functionObjects/field/age/age.C b/src/functionObjects/field/age/age.C
index 783224ef96..4c2cff5b91 100644
--- a/src/functionObjects/field/age/age.C
+++ b/src/functionObjects/field/age/age.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,9 +156,9 @@ bool Foam::functionObjects::age::execute()
 
     // Set under-relaxation coeff
     scalar relaxCoeff = 0.0;
-    if (mesh_.relaxEquation(schemesField_))
+    if (mesh_.solution().relaxEquation(schemesField_))
     {
-        relaxCoeff = mesh_.equationRelaxationFactor(schemesField_);
+        relaxCoeff = mesh_.solution().equationRelaxationFactor(schemesField_);
     }
 
     const Foam::fvModels& fvModels(Foam::fvModels::New(mesh_));
diff --git a/src/functionObjects/field/blendingFactor/blendingFactorTemplates.C b/src/functionObjects/field/blendingFactor/blendingFactorTemplates.C
index 10cee3cc4a..aad44c0474 100644
--- a/src/functionObjects/field/blendingFactor/blendingFactorTemplates.C
+++ b/src/functionObjects/field/blendingFactor/blendingFactorTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ bool Foam::functionObjects::blendingFactor::calcBF()
     const FieldType& field = lookupObject<FieldType>(fieldName_);
 
     const word divScheme("div(" + phiName_ + ',' + fieldName_ + ')');
-    ITstream& its = mesh_.divScheme(divScheme);
+    ITstream& its = mesh_.schemes().div(divScheme);
 
     const surfaceScalarField& phi = lookupObject<surfaceScalarField>(phiName_);
 
diff --git a/src/functionObjects/field/grad/gradTemplates.C b/src/functionObjects/field/grad/gradTemplates.C
index 2f9f5d6a0b..d1d672ed86 100644
--- a/src/functionObjects/field/grad/gradTemplates.C
+++ b/src/functionObjects/field/grad/gradTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ bool Foam::functionObjects::grad::calcGrad()
         (
             resultName_,
             fvc::grad(lookupObject<VolFieldType>(fieldName_)),
-            mesh_.changing() && mesh_.cache(resultName_)
+            mesh_.changing() && mesh_.solution().cache(resultName_)
         );
     }
     else if (foundObject<SurfaceFieldType>(fieldName_))
@@ -48,7 +48,7 @@ bool Foam::functionObjects::grad::calcGrad()
         (
             resultName_,
             fvc::grad(lookupObject<SurfaceFieldType>(fieldName_)),
-            mesh_.changing() && mesh_.cache(resultName_)
+            mesh_.changing() && mesh_.solution().cache(resultName_)
         );
     }
     else
diff --git a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C
index 37e9ede23d..2f20cd9d4f 100644
--- a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C
+++ b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ Foam::volScalarField& Foam::functionObjects::phaseScalarTransport::Phi()
             )
         );
 
-        mesh_.setFluxRequired(PhiPtr_->name());
+        mesh_.schemes().setFluxRequired(PhiPtr_->name());
     }
 
     return PhiPtr_();
@@ -392,8 +392,8 @@ bool Foam::functionObjects::phaseScalarTransport::execute()
 
     // Get the relaxation coefficient
     const scalar relaxCoeff =
-        mesh_.relaxEquation(schemesField_)
-      ? mesh_.equationRelaxationFactor(schemesField_)
+        mesh_.solution().relaxEquation(schemesField_)
+      ? mesh_.solution().equationRelaxationFactor(schemesField_)
       : 0;
 
     const Foam::fvModels& fvModels(Foam::fvModels::New(mesh_));
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index 7823091e93..65a06eaaa0 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ Foam::functionObjects::scalarTransport::scalarTransport
 {
     read(dict);
 
-    const dictionary& controls = mesh_.solverDict(s_.name());
+    const dictionary& controls = mesh_.solution().solverDict(s_.name());
 
     if (controls.found("nSubCycles"))
     {
@@ -238,9 +238,9 @@ bool Foam::functionObjects::scalarTransport::execute()
 
     // Set under-relaxation coeff
     scalar relaxCoeff = 0.0;
-    if (mesh_.relaxEquation(schemesField_))
+    if (mesh_.solution().relaxEquation(schemesField_))
     {
-        relaxCoeff = mesh_.equationRelaxationFactor(schemesField_);
+        relaxCoeff = mesh_.solution().equationRelaxationFactor(schemesField_);
     }
 
     const Foam::fvModels& fvModels(Foam::fvModels::New(mesh_));
@@ -329,7 +329,7 @@ bool Foam::functionObjects::scalarTransport::execute()
 
 void Foam::functionObjects::scalarTransport::subCycleMULES()
 {
-    const dictionary& controls = mesh_.solverDict(s_.name());
+    const dictionary& controls = mesh_.solution().solverDict(s_.name());
     const label nSubCycles(controls.lookup<label>("nSubCycles"));
     const bool LTS = fv::localEulerDdt::enabled(mesh_);
 
@@ -381,7 +381,7 @@ void Foam::functionObjects::scalarTransport::subCycleMULES()
 
 void Foam::functionObjects::scalarTransport::solveMULES()
 {
-    const dictionary& controls = mesh_.solverDict(s_.name());
+    const dictionary& controls = mesh_.solution().solverDict(s_.name());
     const label nCorr(controls.lookup<label>("nCorr"));
     const label nSubCycles(controls.lookup<label>("nSubCycles"));
     const bool MULESCorr(controls.lookupOrDefault<Switch>("MULESCorr", false));
@@ -403,7 +403,7 @@ void Foam::functionObjects::scalarTransport::solveMULES()
 
     surfaceScalarField& sPhi_ = tsPhi_.ref();
 
-    const word sScheme(mesh_.divScheme(divScheme)[1].wordToken());
+    const word sScheme(mesh_.schemes().div(divScheme)[1].wordToken());
 
     // If a compressive convection scheme is used
     // the interface normal must be cached
@@ -433,7 +433,7 @@ void Foam::functionObjects::scalarTransport::solveMULES()
             fv::ddtScheme<scalar>::New
             (
                 mesh_,
-                mesh_.ddtScheme("ddt(s)")
+                mesh_.schemes().ddt("ddt(s)")
             )
         );
         const fv::ddtScheme<scalar>& ddtS = tddtS();
@@ -547,7 +547,7 @@ void Foam::functionObjects::scalarTransport::solveMULES()
             (
                 phiCN(),
                 (cnCoeff*s_ + (1.0 - cnCoeff)*s_.oldTime())(),
-                mesh_.divScheme(divScheme)
+                mesh_.schemes().div(divScheme)
             )
         );
 
@@ -605,7 +605,7 @@ void Foam::functionObjects::scalarTransport::solveMULES()
 
     if
     (
-        word(mesh_.ddtScheme("ddt(s)"))
+        word(mesh_.schemes().ddt("ddt(s)"))
      == fv::CrankNicolsonDdtScheme<scalar>::typeName
     )
     {
diff --git a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
index 4b6fdf0e3f..04499265a7 100644
--- a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
+++ b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
@@ -1456,7 +1456,7 @@ Foam::fvMeshTopoChangers::refiner::~refiner()
 
 bool Foam::fvMeshTopoChangers::refiner::update()
 {
-    // Only refine on the first call it a time-step
+    // Only refine on the first call in a time-step
     if (timeIndex_ != mesh().time().timeIndex())
     {
         timeIndex_ = mesh().time().timeIndex();
diff --git a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
index 4ab466f225..068af9ecfb 100644
--- a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
+++ b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -207,16 +207,16 @@ class refiner
         //  refinement of protectedCells_ (since 2:1 refinement cascade)
         void calculateProtectedCells(PackedBoolList& unrefineableCells) const;
 
-        //- Read the projection parameters from dictionary
+        //- Read the parameters from dictionary
         void readDict();
 
-
         //- Refine cells. Update mesh and fields.
         autoPtr<mapPolyMesh> refine(const labelList&);
 
         //- Unrefine cells. Gets passed in centre points of cells to combine.
         autoPtr<mapPolyMesh> unrefine(const labelList&);
 
+        //- Find the U field name corresponding to Uf
         word Uname(const surfaceVectorField& Uf) const;
 
         void refineFluxes
diff --git a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/cloudSolution/cloudSolution.C b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/cloudSolution/cloudSolution.C
index e5710fedd7..c38c3a9b80 100644
--- a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/cloudSolution/cloudSolution.C
+++ b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/cloudSolution/cloudSolution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ void Foam::cloudSolution::read()
             transient_ = false;
         }
 
-        if (mesh_.steady())
+        if (mesh_.schemes().steady())
         {
             IOWarningInFunction(dict_)
                 << "Transient tracking is not supported for steady-state"
diff --git a/src/lagrangian/parcel/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/parcel/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index 1b4a4ee3ab..5759115314 100644
--- a/src/lagrangian/parcel/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/parcel/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,7 +126,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
                 cloudName + ":uSqrAverage"
             );
 
-        mesh.setFluxRequired(alpha_.name());
+        mesh.schemes().setFluxRequired(alpha_.name());
 
         // Property fields
         // ~~~~~~~~~~~~~~~
diff --git a/src/regionModels/regionModel/regionModel/regionModelI.H b/src/regionModels/regionModel/regionModel/regionModelI.H
index 8a06ec501a..987f19b55a 100644
--- a/src/regionModels/regionModel/regionModel/regionModelI.H
+++ b/src/regionModels/regionModel/regionModel/regionModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ inline const Foam::dictionary& Foam::regionModels::regionModel::coeffs() const
 inline const Foam::dictionary&
 Foam::regionModels::regionModel::solution() const
 {
-    return regionMesh().solutionDict();
+    return regionMesh().solution().dict();
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 068e2ff73e..81ee3cb619 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -414,7 +414,7 @@ void kinematicSingleLayer::solveAlpha
         alphaf*rhof*alpharAUf*rhogf
     );
 
-    regionMesh().setFluxRequired(alpha_.name());
+    regionMesh().schemes().setFluxRequired(alpha_.name());
 
     while (pimple_.correctNonOrthogonal())
     {
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
index 5c98aadf15..faf6455781 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
@@ -332,7 +332,7 @@ Foam::tmp<Foam::surfaceScalarField>
 Foam::heSolidThermo<BasicSolidThermo, MixtureType>::q() const
 {
     const fvMesh& mesh = this->T_.mesh();
-    mesh.setFluxRequired(this->T_.name());
+    mesh.schemes().setFluxRequired(this->T_.name());
 
     return
       - (
diff --git a/src/twoPhaseModels/twoPhaseMixture/VoF/alphaControls.H b/src/twoPhaseModels/twoPhaseMixture/VoF/alphaControls.H
index bbb8969255..c679825f3a 100644
--- a/src/twoPhaseModels/twoPhaseMixture/VoF/alphaControls.H
+++ b/src/twoPhaseModels/twoPhaseMixture/VoF/alphaControls.H
@@ -1,4 +1,4 @@
-const dictionary& alphaControls = mesh.solverDict(alpha1.name());
+const dictionary& alphaControls = mesh.solution().solverDict(alpha1.name());
 
 const label nAlphaCorr(alphaControls.lookup<label>("nAlphaCorr"));
 
diff --git a/src/twoPhaseModels/twoPhaseMixture/VoF/alphaEqn.H b/src/twoPhaseModels/twoPhaseMixture/VoF/alphaEqn.H
index e1975c908d..c4ac7d876c 100644
--- a/src/twoPhaseModels/twoPhaseMixture/VoF/alphaEqn.H
+++ b/src/twoPhaseModels/twoPhaseMixture/VoF/alphaEqn.H
@@ -9,7 +9,7 @@
             fv::ddtScheme<scalar>::New
             (
                 mesh,
-                mesh.ddtScheme("ddt(alpha)")
+                mesh.schemes().ddt("ddt(alpha)")
             )
         );
         const fv::ddtScheme<scalar>& ddtAlpha = tddtAlpha();
@@ -232,9 +232,9 @@
 
     if
     (
-        word(mesh.ddtScheme("ddt(rho,U)"))
+        word(mesh.schemes().ddt("ddt(rho,U)"))
      == fv::EulerDdtScheme<vector>::typeName
-     || word(mesh.ddtScheme("ddt(rho,U)"))
+     || word(mesh.schemes().ddt("ddt(rho,U)"))
      == fv::localEulerDdtScheme<vector>::typeName
     )
     {
diff --git a/src/twoPhaseModels/twoPhaseMixture/VoF/alphaScheme.H b/src/twoPhaseModels/twoPhaseMixture/VoF/alphaScheme.H
index 075751866b..2910d8bb0c 100644
--- a/src/twoPhaseModels/twoPhaseMixture/VoF/alphaScheme.H
+++ b/src/twoPhaseModels/twoPhaseMixture/VoF/alphaScheme.H
@@ -1,11 +1,11 @@
 static const word divAlphaName("div(phi,alpha)");
 
-const word alphaScheme(mesh.divScheme(divAlphaName)[1].wordToken());
+const word alphaScheme(mesh.schemes().div(divAlphaName)[1].wordToken());
 
 ITstream compressionScheme
 (
     compressionSchemes.found(alphaScheme)
-  ? mesh.divScheme(divAlphaName)
+  ? mesh.schemes().div(divAlphaName)
   : ITstream
     (
         divAlphaName,