diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
index a90b1903b38e65d409c6dbd2570efe3dce821452..3c7cb43b2667d102d9c3742a5ae718448dcb6b6c 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
@@ -119,18 +119,10 @@ bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
     {
-        if (coeffs_.found("UNames"))
+        if (!coeffs_.readIfPresent("UNames", fieldNames_))
         {
-            coeffs_.lookup("UNames") >> fieldNames_;
-        }
-        else if (coeffs_.found("U"))
-        {
-            word UName(coeffs_.lookup("U"));
-            fieldNames_ = wordList(1, UName);
-        }
-        else
-        {
-            fieldNames_ = wordList(1, "U");
+            fieldNames_.resize(1);
+            fieldNames_.first() = coeffs_.lookupOrDefault<word>("U", "U");
         }
 
         applied_.setSize(fieldNames_.size(), false);
diff --git a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
index 883d52b0024b396d010586124ed6b1084062c0c7..0c9198a40fc3b3d90cd66205558ccd7716f30a84 100644
--- a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
+++ b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
@@ -207,18 +207,10 @@ bool Foam::fv::multiphaseMangrovesSource::read(const dictionary& dict)
 {
     if (option::read(dict))
     {
-        if (coeffs_.found("UNames"))
+        if (!coeffs_.readIfPresent("UNames", fieldNames_))
         {
-            coeffs_.lookup("UNames") >> fieldNames_;
-        }
-        else if (coeffs_.found("U"))
-        {
-            word UName(coeffs_.lookup("U"));
-            fieldNames_ = wordList(1, UName);
-        }
-        else
-        {
-            fieldNames_ = wordList(1, "U");
+            fieldNames_.resize(1);
+            fieldNames_.first() = coeffs_.lookupOrDefault<word>("U", "U");
         }
 
         applied_.setSize(fieldNames_.size(), false);
diff --git a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
index 59f50d3a3029ccf7e2de30422265c1ccf56db280..039904c85f1565ae3f7a6668fec5ca34f078d985 100644
--- a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
+++ b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
@@ -205,19 +205,19 @@ void Foam::fv::multiphaseMangrovesTurbulenceModel::addSup
 
     if (eqn.psi().name() == epsilonName_)
     {
-	    fvMatrix<scalar> epsilonEqn
-	    (
+        fvMatrix<scalar> epsilonEqn
+        (
           - fvm::Sp(rho*epsilonCoeff(U), eqn.psi())
         );
         eqn += epsilonEqn;
     }
     else if (eqn.psi().name() == kName_)
     {
-	    fvMatrix<scalar> kEqn
-	    (
+        fvMatrix<scalar> kEqn
+        (
           - fvm::Sp(rho*kCoeff(U), eqn.psi())
         );
-	    eqn += kEqn;
+        eqn += kEqn;
     }
 }
 
@@ -226,20 +226,19 @@ bool Foam::fv::multiphaseMangrovesTurbulenceModel::read(const dictionary& dict)
 {
     if (option::read(dict))
     {
-        if (coeffs_.found("epsilonNames"))
+        if (!coeffs_.readIfPresent("epsilonNames", fieldNames_))
         {
-            coeffs_.lookup("epsilonNames") >> fieldNames_;
-        }
-        else if (coeffs_.found("epsilon"))
-        {
-            word UName(coeffs_.lookup("epsilon"));
-            fieldNames_ = wordList(1, UName);
-        }
-        else
-        {
-	        fieldNames_.setSize(2);
-	        fieldNames_[0] = "epsilon";
-    	    fieldNames_[1] = "k";
+            if (coeffs_.found("epsilon"))
+            {
+                fieldNames_.resize(1);
+                coeffs_.read("epsilon", fieldNames_.first());
+            }
+            else
+            {
+                fieldNames_.resize(2);
+                fieldNames_[0] = "epsilon";
+                fieldNames_[1] = "k";
+            }
         }
 
         applied_.setSize(fieldNames_.size(), false);