diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
index 864ebe11b9..51a46046fc 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -122,7 +122,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     alphaSolidT_(Function1<scalar>::New("alphaSolidT", coeffs_)),
     L_("L", dimEnergy/dimMass, coeffs_),
     relax_(coeffs_.getOrDefault("relax", 0.9)),
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
index a7a19e2491..62ae9ae700 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
@@ -99,7 +99,7 @@ namespace fv
 
 class VoFSolidificationMeltingSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private data
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
index 069c34d6ba..2119ba1e62 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
@@ -31,7 +31,7 @@ License
 
 bool Foam::fv::VoFSolidificationMeltingSource::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         alphaSolidT_ = Function1<scalar>::New("alphaSolidT", coeffs_);
         coeffs_.readEntry("L", L_);
diff --git a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
index 8f8b5e0ffc..d221ac3682 100644
--- a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
@@ -51,7 +51,7 @@ Foam::fv::atmAmbientTurbSource::atmAmbientTurbSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     isEpsilon_(true),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
     kAmb_
diff --git a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.H b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.H
index fa7bb11796..b3addecdd1 100644
--- a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.H
+++ b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.H
@@ -130,7 +130,7 @@ namespace fv
 
 class atmAmbientTurbSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
index 111bafe6b2..4cec1cacf6 100644
--- a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
@@ -133,7 +133,7 @@ Foam::fv::atmBuoyancyTurbSource::atmBuoyancyTurbSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     isEpsilon_(true),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
     Lmax_
diff --git a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.H b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.H
index c03be68be1..a069387390 100644
--- a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.H
+++ b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.H
@@ -145,7 +145,7 @@ namespace fv
 
 class atmBuoyancyTurbSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.C b/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.C
index d53653d5ad..bcd5a83948 100644
--- a/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.C
+++ b/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.C
@@ -68,7 +68,7 @@ Foam::fv::atmCoriolisUSource::atmCoriolisUSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     latitude_
     (
         coeffs_.getCheckOrDefault<scalar>
diff --git a/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.H b/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.H
index e5e127bf6e..f2f501faa4 100644
--- a/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.H
+++ b/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.H
@@ -146,7 +146,7 @@ namespace fv
 
 class atmCoriolisUSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
index c45ab84f1d..c0d342dcfd 100644
--- a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
@@ -87,7 +87,7 @@ Foam::fv::atmLengthScaleTurbSource::atmLengthScaleTurbSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     isEpsilon_(true),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
     Lmax_
diff --git a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.H b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.H
index 7bf73ef708..89b0cacc94 100644
--- a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.H
+++ b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.H
@@ -133,7 +133,7 @@ namespace fv
 
 class atmLengthScaleTurbSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.C b/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.C
index b67ce2ab73..c0ca1a6b5b 100644
--- a/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.C
+++ b/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.C
@@ -51,7 +51,7 @@ Foam::fv::atmNutSource::atmNutSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     artNutName_(dict.getOrDefault<word>("nut", "artNut")),
     artNut_
     (
diff --git a/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.H b/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.H
index 60b562a966..c84f9d30ac 100644
--- a/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.H
+++ b/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.H
@@ -102,7 +102,7 @@ namespace fv
 
 class atmNutSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.C
index 5faebf5973..dbb68bfbb5 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.C
@@ -51,7 +51,7 @@ Foam::fv::atmPlantCanopyTSource::atmPlantCanopyTSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
     Cp0_
     (
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.H b/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.H
index bd959589e2..ae5069cde2 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.H
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.H
@@ -105,7 +105,7 @@ namespace fv
 
 class atmPlantCanopyTSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
index b137b8ae94..ebf6ab7884 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
@@ -64,7 +64,7 @@ Foam::fv::atmPlantCanopyTurbSource::atmPlantCanopyTurbSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     isEpsilon_(true),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
     Cmu_(Zero),
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H
index 8cc7e779e8..e6a053ee53 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H
@@ -114,7 +114,7 @@ namespace fv
 
 class atmPlantCanopyTurbSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
index cefd8f8776..f1044030bd 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
@@ -51,7 +51,7 @@ Foam::fv::atmPlantCanopyUSource::atmPlantCanopyUSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
     plantCd_
     (
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H
index b3f15b05f1..035204be7e 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H
@@ -113,7 +113,7 @@ namespace fv
 
 class atmPlantCanopyUSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/faOptions/faceSetOption/faceSetOption.C b/src/faOptions/faceSetOption/faceSetOption.C
index 04eefeb2ff..90d10014e7 100644
--- a/src/faOptions/faceSetOption/faceSetOption.C
+++ b/src/faOptions/faceSetOption/faceSetOption.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -181,7 +181,7 @@ Foam::fa::faceSetOption::faceSetOption
     const fvPatch& patch
 )
 :
-    option(name, modelType, dict, patch),
+    fa::option(name, modelType, dict, patch),
     timeStart_(-1.0),
     duration_(0.0),
     selectionMode_(selectionModeTypeNames_.get("selectionMode", coeffs_)),
diff --git a/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C b/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
index 8830273407..5865449c5a 100644
--- a/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
+++ b/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
@@ -54,7 +54,7 @@ Foam::fa::contactHeatFluxSource::contactHeatFluxSource
     const fvPatch& patch
 )
 :
-    faceSetOption(sourceName, modelType, dict, patch),
+    fa::faceSetOption(sourceName, modelType, dict, patch),
     temperatureCoupledBase(patch, dict),
     TName_(dict.getOrDefault<word>("T", "T")),
     TprimaryName_(dict.get<word>("Tprimary")),
@@ -175,7 +175,7 @@ void Foam::fa::contactHeatFluxSource::addSup
 
 bool Foam::fa::contactHeatFluxSource::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fa::option::read(dict))
     {
         coeffs_.readIfPresent("T", TName_);
 
diff --git a/src/faOptions/sources/derived/externalFileSource/externalFileSource.C b/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
index cc6da00221..ed557286e6 100644
--- a/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
+++ b/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
@@ -53,7 +53,7 @@ Foam::fa::externalFileSource::externalFileSource
     const fvPatch& p
 )
 :
-    faceSetOption(sourceName, modelType, dict, p),
+    fa::faceSetOption(sourceName, modelType, dict, p),
     fieldName_(dict.get<word>("fieldName")),
     tableName_(dict.get<word>("tableName")),
     pExt_
@@ -118,7 +118,7 @@ void Foam::fa::externalFileSource::addSup
 
 bool Foam::fa::externalFileSource::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fa::option::read(dict))
     {
         return true;
     }
diff --git a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
index 2a559f0fe7..6c177730c5 100644
--- a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
+++ b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
@@ -68,7 +68,7 @@ Foam::fa::externalHeatFluxSource::externalHeatFluxSource
     const fvPatch& patch
 )
 :
-    faceSetOption(sourceName, modelType, dict, patch),
+    fa::faceSetOption(sourceName, modelType, dict, patch),
     mode_(operationModeNames.get("mode", dict)),
     TName_(dict.getOrDefault<word>("T", "T")),
     Q_(0),
@@ -172,7 +172,7 @@ void Foam::fa::externalHeatFluxSource::addSup
 
 bool Foam::fa::externalHeatFluxSource::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fa::option::read(dict))
     {
         dict.readIfPresent("T", TName_);
         dict.readIfPresent("emissivity", emissivity_);
diff --git a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index 583fd34ecd..68a02faa3c 100644
--- a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -52,7 +52,7 @@ Foam::fa::jouleHeatingSource::jouleHeatingSource
     const fvPatch& patch
 )
 :
-    faceSetOption(sourceName, modelType, dict, patch),
+    fa::faceSetOption(sourceName, modelType, dict, patch),
     TName_(dict.getOrDefault<word>("T", "T")),
     V_
     (
@@ -174,7 +174,7 @@ void Foam::fa::jouleHeatingSource::addSup
 
 bool Foam::fa::jouleHeatingSource::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fa::option::read(dict))
     {
         dict.readIfPresent("T", TName_);
 
diff --git a/src/fvOptions/cellSetOption/cellSetOption.C b/src/fvOptions/cellSetOption/cellSetOption.C
index 7f4d7168eb..b74fb597db 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.C
+++ b/src/fvOptions/cellSetOption/cellSetOption.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -204,7 +204,7 @@ Foam::fv::cellSetOption::cellSetOption
     const fvMesh& mesh
 )
 :
-    option(name, modelType, dict, mesh),
+    fv::option(name, modelType, dict, mesh),
     timeStart_(-1.0),
     duration_(0.0),
     selectionMode_(selectionModeTypeNames_.get("selectionMode", coeffs_)),
@@ -224,7 +224,7 @@ Foam::fv::cellSetOption::cellSetOption
 
 bool Foam::fv::cellSetOption::isActive()
 {
-    if (option::isActive() && inTimeLimits(mesh_.time().value()))
+    if (fv::option::isActive() && inTimeLimits(mesh_.time().value()))
     {
         // Update the cell set if the mesh is changing
         if (mesh_.changing())
@@ -254,7 +254,7 @@ bool Foam::fv::cellSetOption::isActive()
 
 bool Foam::fv::cellSetOption::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         if (coeffs_.readIfPresent("timeStart", timeStart_))
         {
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 1142b18bba..17669fd837 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -69,7 +69,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     mode_(temperatureModeNames_.get("mode", coeffs_)),
     Tuniform_(nullptr),
     TName_("T")
@@ -146,7 +146,7 @@ void Foam::fv::fixedTemperatureConstraint::constrain
 
 bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         if (coeffs_.found(Tuniform_->name()))
         {
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 41d9435fb8..fa76db60ce 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -119,7 +119,7 @@ namespace fv
 
 class fixedTemperatureConstraint
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 public:
 
diff --git a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
index 9e96727a52..808fda1531 100644
--- a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
+++ b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
@@ -96,7 +96,7 @@ Foam::fv::velocityDampingConstraint::velocityDampingConstraint
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh)
+    fv::cellSetOption(name, modelType, dict, mesh)
 {
     read(dict);
 }
@@ -122,7 +122,7 @@ void Foam::fv::velocityDampingConstraint::writeData(Ostream& os) const
 
 bool Foam::fv::velocityDampingConstraint::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         coeffs_.readEntry("UMax", UMax_);
 
diff --git a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
index e2d73c307d..648e212665 100644
--- a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
+++ b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
@@ -118,7 +118,7 @@ namespace fv
 
 class velocityDampingConstraint
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 protected:
 
diff --git a/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.C b/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.C
index 30681d5891..43f0d08af7 100644
--- a/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.C
+++ b/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.C
@@ -42,7 +42,7 @@ Foam::fv::FixedValueConstraint<Type>::FixedValueConstraint
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh)
+    fv::cellSetOption(name, modelType, dict, mesh)
 {
     read(dict);
 }
@@ -53,7 +53,7 @@ Foam::fv::FixedValueConstraint<Type>::FixedValueConstraint
 template<class Type>
 bool Foam::fv::FixedValueConstraint<Type>::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         const dictionary& fieldValuesDict = coeffs_.subDict("fieldValues");
 
diff --git a/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.H b/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.H
index b0168f904b..6a53ae82d8 100644
--- a/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.H
+++ b/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.H
@@ -116,7 +116,7 @@ namespace fv
 template<class Type>
 class FixedValueConstraint
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/fvOptions/corrections/limitTemperature/limitTemperature.C b/src/fvOptions/corrections/limitTemperature/limitTemperature.C
index 627e69cdeb..f47361f012 100644
--- a/src/fvOptions/corrections/limitTemperature/limitTemperature.C
+++ b/src/fvOptions/corrections/limitTemperature/limitTemperature.C
@@ -53,7 +53,7 @@ Foam::fv::limitTemperature::limitTemperature
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     Tmin_(coeffs_.get<scalar>("min")),
     Tmax_(coeffs_.get<scalar>("max")),
     phase_(coeffs_.getOrDefault<word>("phase", word::null))
@@ -76,7 +76,7 @@ Foam::fv::limitTemperature::limitTemperature
 
 bool Foam::fv::limitTemperature::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         coeffs_.readEntry("min", Tmin_);
         coeffs_.readEntry("max", Tmax_);
diff --git a/src/fvOptions/corrections/limitTemperature/limitTemperature.H b/src/fvOptions/corrections/limitTemperature/limitTemperature.H
index cb9b5164bc..8475bcfdda 100644
--- a/src/fvOptions/corrections/limitTemperature/limitTemperature.H
+++ b/src/fvOptions/corrections/limitTemperature/limitTemperature.H
@@ -104,7 +104,7 @@ namespace fv
 
 class limitTemperature
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 protected:
 
diff --git a/src/fvOptions/corrections/limitVelocity/limitVelocity.C b/src/fvOptions/corrections/limitVelocity/limitVelocity.C
index 4458695984..37f6ccae19 100644
--- a/src/fvOptions/corrections/limitVelocity/limitVelocity.C
+++ b/src/fvOptions/corrections/limitVelocity/limitVelocity.C
@@ -52,7 +52,7 @@ Foam::fv::limitVelocity::limitVelocity
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     UName_(coeffs_.getOrDefault<word>("U", "U")),
     max_(coeffs_.get<scalar>("max"))
 {
@@ -65,7 +65,7 @@ Foam::fv::limitVelocity::limitVelocity
 
 bool Foam::fv::limitVelocity::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         coeffs_.readEntry("max", max_);
 
diff --git a/src/fvOptions/corrections/limitVelocity/limitVelocity.H b/src/fvOptions/corrections/limitVelocity/limitVelocity.H
index 5fdb25a05e..3002139fbd 100644
--- a/src/fvOptions/corrections/limitVelocity/limitVelocity.H
+++ b/src/fvOptions/corrections/limitVelocity/limitVelocity.H
@@ -98,7 +98,7 @@ namespace fv
 
 class limitVelocity
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 protected:
 
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index fc3d90a34b..5f52ffea9e 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -126,7 +126,7 @@ Foam::fv::interRegionOption::interRegionOption
 
 bool Foam::fv::interRegionOption::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         return true;
     }
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
index d9bfb7e95d..f00cd64079 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
@@ -84,7 +84,7 @@ Foam::fv::acousticDampingSource::acousticDampingSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     blendFactor_
     (
         volScalarField
@@ -174,7 +174,7 @@ void Foam::fv::acousticDampingSource::addSup
 
 bool Foam::fv::acousticDampingSource::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         if (!coeffs_.readIfPresent("UNames", fieldNames_))
         {
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
index f2a56766d2..0e471f766c 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
@@ -120,7 +120,7 @@ namespace fv
 
 class acousticDampingSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 protected:
 
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
index 4c4995e801..78b4013226 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
@@ -169,7 +169,7 @@ Foam::fv::actuationDiskSource::actuationDiskSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     writeFile(mesh, name, modelType, coeffs_),
     forceMethod_
     (
@@ -278,7 +278,7 @@ void Foam::fv::actuationDiskSource::addSup
 
 bool Foam::fv::actuationDiskSource::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict) && writeFile::read(dict))
+    if (fv::cellSetOption::read(dict) && writeFile::read(dict))
     {
         dict.readIfPresent("sink", sink_);
         dict.readIfPresent("writeFileStart", writeFileStart_);
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
index 38856b6278..18304a5330 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
@@ -227,7 +227,7 @@ namespace fv
 
 class actuationDiskSource
 :
-    public cellSetOption,
+    public fv::cellSetOption,
     public functionObjects::writeFile
 {
 protected:
diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
index 92d0cb41d5..d54e8968eb 100644
--- a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
+++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
@@ -53,7 +53,7 @@ Foam::fv::buoyancyEnergy::buoyancyEnergy
     const fvMesh& mesh
 )
 :
-    option(sourceName, modelType, dict, mesh),
+    fv::option(sourceName, modelType, dict, mesh),
     UName_(coeffs_.getOrDefault<word>("U", "U"))
 {
     coeffs_.readEntry("fields", fieldNames_);
@@ -88,7 +88,7 @@ void Foam::fv::buoyancyEnergy::addSup
 
 bool Foam::fv::buoyancyEnergy::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         coeffs_.readIfPresent("UName", UName_);
 
diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
index 1debb34aae..42139248c2 100644
--- a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
+++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
@@ -53,7 +53,7 @@ Foam::fv::buoyancyForce::buoyancyForce
     const fvMesh& mesh
 )
 :
-    option(sourceName, modelType, dict, mesh),
+    fv::option(sourceName, modelType, dict, mesh),
     g_(meshObjects::gravity::New(mesh.time()))
 {
     coeffs_.readEntry("fields", fieldNames_);
diff --git a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
index b2b8be4bab..5b7b0f5a69 100644
--- a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
+++ b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
@@ -134,7 +134,7 @@ Foam::fv::buoyancyTurbSource::buoyancyTurbSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     isEpsilon_(false),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
     alphatName_(coeffs_.getOrDefault<word>("alphat", "alphat")),
diff --git a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.H b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.H
index b9e056b49a..0b0662e36e 100644
--- a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.H
+++ b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.H
@@ -182,7 +182,7 @@ namespace fv
 
 class buoyancyTurbSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
     // Private Data
 
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index 6f1d97e559..26f06df767 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -161,7 +161,7 @@ directionalPressureGradientExplicitSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     model_(pressureDropModelNames_.get("model", coeffs_)),
     gradP0_(cells_.size(), Zero),
     dGradP_(cells_.size(), Zero),
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
index 5336714184..a136f4ec23 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
@@ -140,7 +140,7 @@ namespace fv
 
 class directionalPressureGradientExplicitSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 public:
 
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index e2d9b56fd4..fd57e62d40 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -135,7 +135,7 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     secondaryMassFlowRate_(0),
     secondaryInletT_(0),
     primaryInletT_(0),
@@ -306,7 +306,7 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
 
 bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         UName_ = coeffs_.getOrDefault<word>("U", "U");
         TName_ = coeffs_.getOrDefault<word>("T", "T");
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index 6e182e6396..b9d32a057e 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -218,7 +218,7 @@ namespace fv
 
 class effectivenessHeatExchangerSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 protected:
 
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
index d52cd09b5f..805c55b41c 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
@@ -54,7 +54,7 @@ Foam::fv::explicitPorositySource::explicitPorositySource
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     porosityPtr_(nullptr)
 {
     read(dict);
@@ -115,7 +115,7 @@ void Foam::fv::explicitPorositySource::addSup
 
 bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         if (!coeffs_.readIfPresent("UNames", fieldNames_))
         {
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
index d849a8c59d..09d54af1e3 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
@@ -136,7 +136,7 @@ namespace fv
 
 class explicitPorositySource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 protected:
 
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index 5b59cfbfc8..be59edca20 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -109,7 +109,7 @@ Foam::fv::jouleHeatingSource::jouleHeatingSource
     const fvMesh& mesh
 )
 :
-    option(sourceName, modelType, dict, mesh),
+    fv::option(sourceName, modelType, dict, mesh),
     TName_("T"),
     V_
     (
@@ -203,7 +203,7 @@ void Foam::fv::jouleHeatingSource::addSup
 
 bool Foam::fv::jouleHeatingSource::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         coeffs_.readIfPresent("T", TName_);
 
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index f10e8d8d97..909d57f395 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -82,7 +82,7 @@ Foam::fv::meanVelocityForce::meanVelocityForce
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     Ubar_(coeffs_.get<vector>("Ubar")),
     gradP0_(0.0),
     dGradP_(0.0),
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
index 31e25a4023..0a01bbbb2d 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
@@ -112,7 +112,7 @@ namespace fv
 
 class meanVelocityForce
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 protected:
 
diff --git a/src/fvOptions/sources/derived/multiphaseStabilizedTurbulence/multiphaseStabilizedTurbulence.C b/src/fvOptions/sources/derived/multiphaseStabilizedTurbulence/multiphaseStabilizedTurbulence.C
index b88e716163..e49185ef83 100644
--- a/src/fvOptions/sources/derived/multiphaseStabilizedTurbulence/multiphaseStabilizedTurbulence.C
+++ b/src/fvOptions/sources/derived/multiphaseStabilizedTurbulence/multiphaseStabilizedTurbulence.C
@@ -57,7 +57,7 @@ Foam::fv::multiphaseStabilizedTurbulence::multiphaseStabilizedTurbulence
     const fvMesh& mesh
 )
 :
-    option(sourceName, modelType, dict, mesh),
+    fv::option(sourceName, modelType, dict, mesh),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
     Cmu_
     (
diff --git a/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.C b/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.C
index 7d90715a32..1000c00a30 100644
--- a/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.C
+++ b/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.C
@@ -42,7 +42,7 @@ Foam::fv::PhaseLimitStabilization<Type>::PhaseLimitStabilization
     const fvMesh& mesh
 )
 :
-    option(name, modelType, dict, mesh),
+    fv::option(name, modelType, dict, mesh),
     fieldName_(coeffs_.get<word>("field")),
     rateName_(coeffs_.get<word>("rate")),
     residualAlpha_(coeffs_.get<scalar>("residualAlpha"))
@@ -75,7 +75,7 @@ void Foam::fv::PhaseLimitStabilization<Type>::addSup
 template<class Type>
 bool Foam::fv::PhaseLimitStabilization<Type>::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         coeffs_.readEntry("residualAlpha", residualAlpha_);
 
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 2094eb7170..4c70b9bc15 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -452,7 +452,7 @@ Foam::fv::rotorDiskSource::rotorDiskSource
 
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     rhoRef_(1.0),
     omega_(0.0),
     nBlades_(0),
@@ -545,7 +545,7 @@ void Foam::fv::rotorDiskSource::addSup
 
 bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         coeffs_.readEntry("fields", fieldNames_);
         fv::option::resetApplied();
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index e61f83fffd..d0808d775f 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -204,7 +204,7 @@ namespace fv
 
 class rotorDiskSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 public:
 
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index ca9deb5827..0e3e4d9104 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -162,7 +162,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(sourceName, modelType, dict, mesh),
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
     Tmelt_(coeffs_.get<scalar>("Tmelt")),
     L_(coeffs_.get<scalar>("L")),
     relax_(coeffs_.getOrDefault<scalar>("relax", 0.9)),
@@ -296,7 +296,7 @@ void Foam::fv::solidificationMeltingSource::addSup
 
 bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         coeffs_.readEntry("Tmelt", Tmelt_);
         coeffs_.readEntry("L", L_);
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index 6ff5453e26..33b67a4606 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -153,7 +153,7 @@ namespace fv
 
 class solidificationMeltingSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 public:
 
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
index eafb5d8dc7..9b8e579678 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
@@ -54,7 +54,7 @@ Foam::fv::tabulatedAccelerationSource::tabulatedAccelerationSource
     const fvMesh& mesh
 )
 :
-    option(name, modelType, dict, mesh),
+    fv::option(name, modelType, dict, mesh),
     motion_(coeffs_, mesh.time()),
     UName_(coeffs_.getOrDefault<word>("U", "U")),
     g0_("g0", dimAcceleration, Zero)
@@ -94,7 +94,7 @@ void Foam::fv::tabulatedAccelerationSource::addSup
 
 bool Foam::fv::tabulatedAccelerationSource::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         return motion_.read(coeffs_);
     }
diff --git a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
index 79673faffa..ac2d5b980b 100644
--- a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
+++ b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
@@ -89,7 +89,7 @@ Foam::fv::viscousDissipation::viscousDissipation
     const fvMesh& mesh
 )
 :
-    option(sourceName, modelType, dict, mesh),
+    fv::option(sourceName, modelType, dict, mesh),
     UName_(coeffs_.getOrDefault<word>("U", "U")),
     rhoName_(coeffs_.getOrDefault<word>("rho", "none")),
     rho_
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index f605301139..cbb84b1b71 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -117,7 +117,7 @@ Foam::fv::SemiImplicitSource<Type>::SemiImplicitSource
     const fvMesh& mesh
 )
 :
-    cellSetOption(name, modelType, dict, mesh),
+    fv::cellSetOption(name, modelType, dict, mesh),
     volumeMode_(vmAbsolute),
     VDash_(1.0)
 {
@@ -203,7 +203,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 template<class Type>
 bool Foam::fv::SemiImplicitSource<Type>::read(const dictionary& dict)
 {
-    if (cellSetOption::read(dict))
+    if (fv::cellSetOption::read(dict))
     {
         volumeMode_ = volumeModeTypeNames_.get("volumeMode", coeffs_);
         setFieldData(coeffs_.subDict("injectionRateSuSp"));
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
index c5a0fd56ea..d3a375dcc4 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
@@ -146,7 +146,7 @@ Ostream& operator<<
 template<class Type>
 class SemiImplicitSource
 :
-    public cellSetOption
+    public fv::cellSetOption
 {
 public:
 
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index e800b41ced..8464af5085 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -254,7 +254,7 @@ void Foam::fv::tabulatedNTUHeatTransfer::calculateHtc()
 
 bool Foam::fv::tabulatedNTUHeatTransfer::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         coeffs_.readIfPresent("U", UName_);
         coeffs_.readIfPresent("UNbr", UNbrName_);
diff --git a/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.C b/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.C
index e9f8993233..82d8277e28 100644
--- a/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.C
+++ b/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.C
@@ -53,7 +53,7 @@ Foam::fv::radiation::radiation
     const fvMesh& mesh
 )
 :
-    option(sourceName, modelType, dict, mesh)
+    fv::option(sourceName, modelType, dict, mesh)
 {
     const auto& thermo = mesh_.lookupObject<basicThermo>(basicThermo::dictName);
 
diff --git a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
index b0e7d64fe6..6c9ad94b3e 100644
--- a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
+++ b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
@@ -153,7 +153,7 @@ Foam::fv::multiphaseMangrovesSource::multiphaseMangrovesSource
     const fvMesh& mesh
 )
 :
-    option(name, modelType, dict, mesh),
+    fv::option(name, modelType, dict, mesh),
     aZone_(),
     NZone_(),
     CmZone_(),
@@ -206,7 +206,7 @@ void Foam::fv::multiphaseMangrovesSource::addSup
 
 bool Foam::fv::multiphaseMangrovesSource::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         if (!coeffs_.readIfPresent("UNames", fieldNames_))
         {
diff --git a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
index 5cda1d1da8..e9fd781b4d 100644
--- a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
+++ b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
@@ -154,7 +154,7 @@ Foam::fv::multiphaseMangrovesTurbulenceModel::multiphaseMangrovesTurbulenceModel
     const fvMesh& mesh
 )
 :
-    option(name, modelType, dict, mesh),
+    fv::option(name, modelType, dict, mesh),
     aZone_(),
     NZone_(),
     CkpZone_(),
@@ -227,7 +227,7 @@ void Foam::fv::multiphaseMangrovesTurbulenceModel::addSup
 
 bool Foam::fv::multiphaseMangrovesTurbulenceModel::read(const dictionary& dict)
 {
-    if (option::read(dict))
+    if (fv::option::read(dict))
     {
         if (!coeffs_.readIfPresent("epsilonNames", fieldNames_))
         {