diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index eb41aa2bbf..4f3d9c75fc 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -779,7 +779,7 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const
 
             auto sigma = sigmas_.cfind(interfacePair(alpha1, alpha2));
 
-            if (!sigma.found())
+            if (!sigma.good())
             {
                 FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(alpha1, alpha2)
@@ -907,7 +907,7 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
             const auto tp =
                 acap.thetaProps().cfind(interfacePair(alpha1, alpha2));
 
-            if (!tp.found())
+            if (!tp.good())
             {
                 FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(alpha1, alpha2)
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index da3547d18a..7fefaa1642 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -287,7 +287,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const
 
             auto sigma = sigmas_.cfind(interfacePair(alpha1, alpha2));
 
-            if (!sigma.found())
+            if (!sigma.good())
             {
                 FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(alpha1, alpha2)
@@ -463,7 +463,7 @@ void Foam::multiphaseMixture::correctBoundaryContactAngle
 
     const auto tp = acap.thetaProps().cfind(interfacePair(alpha1, alpha2));
 
-    if (!tp.found())
+    if (!tp.good())
     {
         FatalErrorInFunction
             << "Cannot find interface " << interfacePair(alpha1, alpha2)
diff --git a/applications/test/Map/Test-Map.C b/applications/test/Map/Test-Map.C
index d4cb2933ac..9df5bc1a25 100644
--- a/applications/test/Map/Test-Map.C
+++ b/applications/test/Map/Test-Map.C
@@ -52,13 +52,13 @@ int main(int argc, char *argv[])
     // Same, but with non-const access
     // Map<bool>::iterator map1Iter = map1.find(5);
 
-    if (!map1Iter.found()) // same as  (map1Iter == map1.end())
+    if (!map1Iter.good())
     {
         Info<< "not found" << endl;
     }
     else
     {
-        Info<< "5 is " << *map1Iter << endl;
+        Info<< "5 is " << map1Iter.val() << endl;
     }
 
     // Repeat with std::map
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index 509ad1d34e..70c288274d 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -353,9 +353,9 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 
             const auto iter = sparseData.cfind(e);
 
-            if (iter.found())
+            if (iter.good())
             {
-                const point& sparsePt = iter();
+                const point& sparsePt = iter.val();
                 const point& fullPt = fullData[meshEdgeI];
 
                 if (fullPt != sparsePt)
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
index 3a17697164..037e3a18b2 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
@@ -86,7 +86,7 @@ Foam::label Foam::cellSplitter::newOwner
 
     const auto iter = cellToCells.cfind(old);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         // Unsplit cell
         return old;
@@ -113,7 +113,7 @@ Foam::label Foam::cellSplitter::newNeighbour
 
     const auto iter = cellToCells.cfind(old);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         // Unsplit cell
         return old;
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 46809fe804..3700bc8b87 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -1063,7 +1063,7 @@ int main(int argc, char *argv[])
 
         const auto iter = fluentToFoamType.cfind(type);
 
-        if (iter.found())
+        if (iter.good())
         {
             // See if we have a periodic and can derive the other side.
             word neighbPatchName;
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 77dc4d738e..4e6a5b3a7c 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -225,7 +225,7 @@ void storeCellInZone
 {
     const auto zoneFnd = physToZone.cfind(regPhys);
 
-    if (zoneFnd.found())
+    if (zoneFnd.good())
     {
         // Existing zone for region
         zoneCells[zoneFnd()].append(celli);
@@ -592,7 +592,7 @@ void readCellsLegacy
             const auto regFnd = physToPatch.cfind(regPhys);
 
             label patchi = -1;
-            if (regFnd.found())
+            if (regFnd.good())
             {
                 // Existing patch for region
                 patchi = regFnd();
@@ -625,7 +625,7 @@ void readCellsLegacy
             const auto regFnd = physToPatch.cfind(regPhys);
 
             label patchi = -1;
-            if (regFnd.found())
+            if (regFnd.good())
             {
                 // Existing patch for region
                 patchi = regFnd();
@@ -934,7 +934,7 @@ void readCells
                 const auto regFnd = physToPatch.cfind(regPhys);
 
                 label patchi = -1;
-                if (regFnd.found())
+                if (regFnd.good())
                 {
                     // Existing patch for region
                     patchi = regFnd();
@@ -972,7 +972,7 @@ void readCells
                 const auto regFnd = physToPatch.cfind(regPhys);
 
                 label patchi = -1;
-                if (regFnd.found())
+                if (regFnd.good())
                 {
                     // Existing patch for region
                     patchi = regFnd();
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 79145cdae3..1b29209c13 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
             // (uses commutative hash)
             auto iter = vertsToBoundary.find(triFace(f[0], f[1], f[2]));
 
-            if (iter.found())
+            if (iter.good())
             {
                 const triFace& tri = iter.key();
                 const label facei = iter.val();
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index c9928cee38..97c67c26a8 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -443,7 +443,7 @@ int main(int argc, char *argv[])
 
                         const auto patchFind = regionToPatch.cfind(region);
 
-                        if (patchFind.found())
+                        if (patchFind.good())
                         {
                             patchi = *patchFind;
                         }
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index 6c647b2938..9a594ec2da 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -124,7 +124,7 @@ void writePoints
 
             const auto e0Fnd = pointToObj.cfind(e[0]);
 
-            if (e0Fnd.found())
+            if (e0Fnd.good())
             {
                 v0 = *e0Fnd;
             }
@@ -139,7 +139,7 @@ void writePoints
 
             const auto e1Fnd = pointToObj.cfind(e[1]);
 
-            if (e1Fnd.found())
+            if (e1Fnd.good())
             {
                 v1 = *e1Fnd;
             }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 77774439ce..3000cf0aed 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -416,7 +416,7 @@ void Foam::DistributedDelaunayMesh<Triangulation>::markVerticesToRefer
         const auto iter = circumsphereOverlaps.cfind(cit->cellIndex());
 
         // Pre-tested circumsphere potential influence
-        if (iter.found())
+        if (iter.good())
         {
             const labelList& citOverlaps = iter();
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 7e857a1e27..4f04583e46 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -2263,7 +2263,7 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
 
         const auto iter = oldToNewIndices.cfind(vIndex);
 
-        if (iter.found())
+        if (iter.good())
         {
             const label newIndex = *iter;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
index 338a38669d..cb77753c88 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
@@ -611,7 +611,7 @@ void Foam::featurePointConformer::reIndexPointPairs
 
         const auto newIndexIter = oldToNewIndices.cfind(currentIndex);
 
-        if (newIndexIter.found())
+        if (newIndexIter.good())
         {
             featurePointVertices_[vI].index() = *newIndexIter;
         }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
index 6800b09498..b4f3e88b16 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
@@ -193,7 +193,7 @@ void Foam::pointPairs<Triangulation>::reIndex(const Map<label>& oldToNewIndices)
         {
             const auto iter2 = oldToNewIndices.cfind(start.first());
 
-            if (iter2.found())
+            if (iter2.good())
             {
                 if (iter2() != -1)
                 {
@@ -210,7 +210,7 @@ void Foam::pointPairs<Triangulation>::reIndex(const Map<label>& oldToNewIndices)
         {
             const auto iter2 = oldToNewIndices.cfind(end.first());
 
-            if (iter2.found())
+            if (iter2.good())
             {
                 if (iter2() != -1)
                 {
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index a653517993..f902ff600f 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -292,11 +292,11 @@ void addToInterface
 
     auto iter = regionsToSize.find(interface);
 
-    if (iter.found())
+    if (iter.good())
     {
         // Check if zone present
         auto zoneIter = iter().find(zoneID);
-        if (zoneIter.found())
+        if (zoneIter.good())
         {
             // Found zone. Increment count.
             ++(*zoneIter);
@@ -408,7 +408,7 @@ void getInterfaceSizes
 
                     auto masterIter = regionsToSize.find(slaveIter.key());
 
-                    if (masterIter.found())
+                    if (masterIter.good())
                     {
                         // Same inter-region
                         Map<label>& masterInfo = *masterIter;
@@ -419,7 +419,7 @@ void getInterfaceSizes
                             const label slaveSize = iter.val();
 
                             auto zoneIter = masterInfo.find(zoneID);
-                            if (zoneIter.found())
+                            if (zoneIter.good())
                             {
                                 *zoneIter += slaveSize;
                             }
diff --git a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
index b0f7f35696..0e0c80568c 100644
--- a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+++ b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
@@ -248,7 +248,7 @@ void removeDict(dictionary& dict, const dictionary& dictToRemove)
                 purge = finder.dict().empty();
             }
         }
-        else if (finder.found() && !refEntry.isDict())
+        else if (finder.good() && !refEntry.isDict())
         {
             // Purge if entries match
             purge = (finder.ref() == refEntry);
@@ -482,7 +482,7 @@ int main(int argc, char *argv[])
             // Print the changed entry
             const auto finder = dict.csearchScoped(scopedName, keyType::REGEX);
 
-            if (finder.found())
+            if (finder.good())
             {
                 Info<< finder.ref();
             }
@@ -531,7 +531,7 @@ int main(int argc, char *argv[])
 
             const auto finder = dict.csearchScoped(scopedName, keyType::REGEX);
 
-            if (!finder.found())
+            if (!finder.good())
             {
                 FatalIOErrorInFunction(dictFile())
                     << "Cannot find entry " << scopedName
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index e6b8da253c..904adb05e3 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -63,7 +63,7 @@ void Foam::domainDecomposition::addInterProcFace
 
     const auto patchiter = nbrToInterPatch[ownerProc].cfind(nbrProc);
 
-    if (patchiter.found())
+    if (patchiter.good())
     {
         // Existing interproc patch. Add to both sides.
         const label toNbrProcPatchi = *patchiter;
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 6221317d78..0ce18f312e 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -657,7 +657,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
         // We don't want to map the decomposition (mapping already tested when
         // mapping the cell centre field)
         auto iter = objects.find("cellDist");
-        if (iter.found())
+        if (iter.good())
         {
             objects.erase(iter);
         }
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index edd58ceb13..9d38c16dcc 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -353,7 +353,7 @@ int main(int argc, char *argv[])
         /// Currently unused
         /// List<vectorField> dirs(nTracks);
         /// const auto Uiter = vectorFields.cfind(UName);
-        /// if (Uiter.found())
+        /// if (Uiter.good())
         /// {
         ///     const auto& UTracks = *Uiter;
         ///     forAll(UTracks, tracki)
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 30a5576a3a..26af769a45 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -97,7 +97,7 @@ IOobjectList preFilterFields
         for (const word& fldName : allNames)
         {
             const auto iter = cloudObjects.cfind(fldName);
-            if (!pred(fldName) || !iter.found())
+            if (!pred(fldName) || !iter.good())
             {
                 continue;  // reject
             }
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
 
                 const auto iter = trackTable.cfind(key);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     particleToTrack[np] = *iter;
                 }
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 568f8586c8..c1aaf562c2 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -116,7 +116,7 @@ HashTable<wordList> extractPatchGroups(const dictionary& boundaryDict)
         for (const word& groupName : groupNames)
         {
             auto groupIter = groupToPatch.find(groupName);
-            if (groupIter.found())
+            if (groupIter.good())
             {
                 (*groupIter).append(patchName);
             }
diff --git a/src/OSspecific/MSwindows/MSwindows.C b/src/OSspecific/MSwindows/MSwindows.C
index fb6f9111ab..8769e3d326 100644
--- a/src/OSspecific/MSwindows/MSwindows.C
+++ b/src/OSspecific/MSwindows/MSwindows.C
@@ -575,7 +575,7 @@ mode_t Foam::mode(const fileName& name, const bool followLink)
     if (!name.empty())
     {
         fileStat fileStatus(name, followLink);
-        if (fileStatus.valid())
+        if (fileStatus.good())
         {
             return fileStatus.status().st_mode;
         }
@@ -687,7 +687,7 @@ off_t Foam::fileSize(const fileName& name, const bool followLink)
     if (!name.empty())
     {
         fileStat fileStatus(name, followLink);
-        if (fileStatus.valid())
+        if (fileStatus.good())
         {
             return fileStatus.status().st_size;
         }
diff --git a/src/OSspecific/MSwindows/fileStat/fileStat.H b/src/OSspecific/MSwindows/fileStat/fileStat.H
index 24176aa2d9..3d4f8f96bd 100644
--- a/src/OSspecific/MSwindows/fileStat/fileStat.H
+++ b/src/OSspecific/MSwindows/fileStat/fileStat.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -120,7 +120,7 @@ public:
     // Access
 
         //- True if file-stat was successful
-        bool valid() const noexcept
+        bool good() const noexcept
         {
             return valid_;
         }
@@ -165,6 +165,12 @@ public:
 
         friend Istream& operator>>(Istream& is, fileStat& fs);
         friend Ostream& operator<<(Ostream& os, const fileStat& fs);
+
+
+    // Housekeeping
+
+        //- True if file-stat was successful
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OSspecific/MSwindows/memInfo/memInfo.C b/src/OSspecific/MSwindows/memInfo/memInfo.C
index 89628c9e89..2e332c70a0 100644
--- a/src/OSspecific/MSwindows/memInfo/memInfo.C
+++ b/src/OSspecific/MSwindows/memInfo/memInfo.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,13 +48,13 @@ Foam::memInfo::memInfo()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-bool Foam::memInfo::valid() const
+bool Foam::memInfo::good() const noexcept
 {
     return peak_ > 0;
 }
 
 
-void Foam::memInfo::clear()
+void Foam::memInfo::clear() noexcept
 {
     peak_ = size_ = rss_ = 0;
     free_ = 0;
diff --git a/src/OSspecific/MSwindows/memInfo/memInfo.H b/src/OSspecific/MSwindows/memInfo/memInfo.H
index f1972a71e8..9e8b8c0c1f 100644
--- a/src/OSspecific/MSwindows/memInfo/memInfo.H
+++ b/src/OSspecific/MSwindows/memInfo/memInfo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,15 +39,15 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef memInfo_H
-#define memInfo_H
+#ifndef Foam_memInfo_H
+#define Foam_memInfo_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 class memInfo;
 class Istream;
 class Ostream;
@@ -62,7 +62,7 @@ Ostream& operator<<(Ostream& os, const memInfo& m);
 
 class memInfo
 {
-    // Private data
+    // Private Data
 
         //- Peak memory used by the process (VmPeak in /proc/PID/status)
         int peak_;
@@ -91,38 +91,25 @@ public:
     // Member Functions
 
         //- True if the memory information appears valid
-        bool valid() const;
+        bool good() const noexcept;
 
         //- Reset to zero
-        void clear();
+        void clear() noexcept;
 
         //- Update according to /proc/PID/status and /proc/memory contents
         const memInfo& update();
 
-
         //- Peak memory (VmPeak in /proc/PID/status) at last update()
-        inline int peak() const
-        {
-            return peak_;
-        }
+        int peak() const noexcept { return peak_; }
 
         //- Memory size (VmSize in /proc/PID/status) at last update()
-        inline int size() const
-        {
-            return size_;
-        }
+        int size() const noexcept { return size_; }
 
         //- Resident set size (VmRSS in /proc/PID/status) at last update()
-        inline int rss() const
-        {
-            return rss_;
-        }
+        int rss() const noexcept { return rss_; }
 
         //- System memory free (MemFree in /proc/meminfo)
-        inline int free() const
-        {
-            return free_;
-        }
+        int free() const noexcept { return free_; }
 
 
       // Write
@@ -138,6 +125,12 @@ public:
 
         //- Write peak/size/rss to stream
         friend Ostream& operator<<(Ostream& os, const memInfo& m);
+
+
+    // Housekeeping
+
+        //- True if the memory information appears valid
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 93c4709119..adc6e544de 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -714,7 +714,7 @@ mode_t Foam::mode(const fileName& name, const bool followLink)
     if (!name.empty())
     {
         fileStat fileStatus(name, followLink);
-        if (fileStatus.valid())
+        if (fileStatus.good())
         {
             return fileStatus.status().st_mode;
         }
@@ -846,7 +846,7 @@ off_t Foam::fileSize(const fileName& name, const bool followLink)
     if (!name.empty())
     {
         fileStat fileStatus(name, followLink);
-        if (fileStatus.valid())
+        if (fileStatus.good())
         {
             return fileStatus.status().st_size;
         }
diff --git a/src/OSspecific/POSIX/fileStat/fileStat.H b/src/OSspecific/POSIX/fileStat/fileStat.H
index 24176aa2d9..3d4f8f96bd 100644
--- a/src/OSspecific/POSIX/fileStat/fileStat.H
+++ b/src/OSspecific/POSIX/fileStat/fileStat.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -120,7 +120,7 @@ public:
     // Access
 
         //- True if file-stat was successful
-        bool valid() const noexcept
+        bool good() const noexcept
         {
             return valid_;
         }
@@ -165,6 +165,12 @@ public:
 
         friend Istream& operator>>(Istream& is, fileStat& fs);
         friend Ostream& operator<<(Ostream& os, const fileStat& fs);
+
+
+    // Housekeeping
+
+        //- True if file-stat was successful
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OSspecific/POSIX/memInfo/memInfo.C b/src/OSspecific/POSIX/memInfo/memInfo.C
index b1c9906fe9..63fc7cbd3c 100644
--- a/src/OSspecific/POSIX/memInfo/memInfo.C
+++ b/src/OSspecific/POSIX/memInfo/memInfo.C
@@ -48,13 +48,13 @@ Foam::memInfo::memInfo()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-bool Foam::memInfo::valid() const
+bool Foam::memInfo::good() const noexcept
 {
     return peak_ > 0;
 }
 
 
-void Foam::memInfo::clear()
+void Foam::memInfo::clear() noexcept
 {
     peak_ = size_ = rss_ = 0;
     free_ = 0;
diff --git a/src/OSspecific/POSIX/memInfo/memInfo.H b/src/OSspecific/POSIX/memInfo/memInfo.H
index abbae1a72d..0dd54af18c 100644
--- a/src/OSspecific/POSIX/memInfo/memInfo.H
+++ b/src/OSspecific/POSIX/memInfo/memInfo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,15 +39,15 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef memInfo_H
-#define memInfo_H
+#ifndef Foam_memInfo_H
+#define Foam_memInfo_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 class memInfo;
 class Istream;
 class Ostream;
@@ -62,7 +62,7 @@ Ostream& operator<<(Ostream& os, const memInfo& m);
 
 class memInfo
 {
-    // Private data
+    // Private Data
 
         //- Peak memory used by the process (VmPeak in /proc/PID/status)
         int peak_;
@@ -91,38 +91,26 @@ public:
     // Member Functions
 
         //- True if the memory information appears valid
-        bool valid() const;
+        bool good() const noexcept;
 
         //- Reset to zero
-        void clear();
+        void clear() noexcept;
 
         //- Update according to /proc/PID/status and /proc/memory contents
         const memInfo& update();
 
 
         //- Peak memory (VmPeak in /proc/PID/status) at last update()
-        inline int peak() const
-        {
-            return peak_;
-        }
+        int peak() const noexcept { return peak_; }
 
         //- Memory size (VmSize in /proc/PID/status) at last update()
-        inline int size() const
-        {
-            return size_;
-        }
+        int size() const noexcept { return size_; }
 
         //- Resident set size (VmRSS in /proc/PID/status) at last update()
-        inline int rss() const
-        {
-            return rss_;
-        }
+        int rss() const noexcept { return rss_; }
 
         //- System memory free (MemFree in /proc/meminfo)
-        inline int free() const
-        {
-            return free_;
-        }
+        int free() const noexcept { return free_; }
 
 
       // Write
@@ -138,6 +126,12 @@ public:
 
         //- Write peak/size/rss to stream
         friend Ostream& operator<<(Ostream& os, const memInfo& m);
+
+
+    // Housekeeping
+
+        //- True if the memory information appears valid
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
index 79c4b8f43c..a0483d57aa 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
@@ -101,9 +101,9 @@ const T* Foam::DictionaryBase<IDLListType, T>::cfind
 {
     const auto iter = hashedTs_.cfind(keyword);
 
-    if (iter.found())
+    if (iter.good())
     {
-        return *iter;
+        return iter.val();
     }
 
     return nullptr;
@@ -115,9 +115,9 @@ T* Foam::DictionaryBase<IDLListType, T>::find(const word& keyword)
 {
     auto iter = hashedTs_.find(keyword);
 
-    if (iter.found())
+    if (iter.good())
     {
-        return *iter;
+        return iter.val();
     }
 
     return nullptr;
@@ -129,14 +129,14 @@ const T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword) const
 {
     const auto iter = hashedTs_.cfind(keyword);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalErrorInFunction
             << "'" << keyword << "' not found"
             << exit(FatalError);
     }
 
-    return *iter;
+    return iter.val();
 }
 
 
@@ -145,14 +145,14 @@ T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword)
 {
     auto iter = hashedTs_.find(keyword);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalErrorInFunction
             << "'" << keyword << "' not found"
             << exit(FatalError);
     }
 
-    return *iter;
+    return iter.val();
 }
 
 
@@ -215,7 +215,7 @@ T* Foam::DictionaryBase<IDLListType, T>::remove(const word& keyword)
 {
     auto iter = hashedTs_.find(keyword);
 
-    if (iter.found())
+    if (iter.good())
     {
         T* ptr = IDLListType::remove(iter.val());
         hashedTs_.erase(iter);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 7cb9e521ae..a4fbe118b6 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -306,9 +306,9 @@ Foam::label Foam::inplaceMapValue
         label& value = iter.val();
 
         auto mapIter = mapper.find(value);
-        if (mapIter.found() && value != *mapIter)
+        if (mapIter.good() && value != mapIter.val())
         {
-            value = *mapIter;
+            value = mapIter.val();
             ++nChanged;
         }
     }
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
index ed05c2e11c..f2d9cd47e6 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
@@ -183,7 +183,7 @@ bool Foam::dynamicCode::writeCommentSHA1(Ostream& os) const
 {
     const auto fnd = filterVars_.cfind("SHA1sum");
 
-    if (!fnd.found())
+    if (!fnd.good())
     {
         return false;
     }
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 0340be73b1..a5ecf4b667 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -93,7 +93,7 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
         const auto finder =
             dict.csearchCompat("libs", {{"functionObjectLibs", 1612}});
 
-        if (finder.found())
+        if (finder.good())
         {
             runTime.libs().open
             (
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index fb44d80e37..857dc3a315 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -151,7 +151,7 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObjectList::remove
 
     auto iter = indices_.find(key);  // Index of existing functionObject
 
-    if (iter.found())
+    if (iter.good())
     {
         oldIndex = *iter;
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index af4e2b6f12..9f730d0375 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -281,7 +281,7 @@ bool Foam::objectRegistry::checkOut(regIOobject* io) const
 
     iterator iter = obr.find(io->name());
 
-    if (iter.found())
+    if (iter.good())
     {
         if (objectRegistry::debug)
         {
@@ -374,7 +374,7 @@ bool Foam::objectRegistry::erase(const iterator& iter)
 {
     // Remove from registry - see notes in objectRegistry::clear()
 
-    if (iter.found())
+    if (iter.good())
     {
         regIOobject* ptr = const_cast<iterator&>(iter).val();
 
@@ -437,7 +437,7 @@ const Foam::regIOobject* Foam::objectRegistry::cfindIOobject
 {
     const_iterator iter = cfind(name);
 
-    if (iter.found())
+    if (iter.good())
     {
         return iter.val();
     }
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index 6b2d25a957..a4cb56253d 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -546,9 +546,9 @@ const Type& Foam::objectRegistry::lookupObject
 {
     const_iterator iter = cfind(name);
 
-    if (iter.found())
+    if (iter.good())
     {
-        const Type* ptr = dynamic_cast<const Type*>(iter());
+        const Type* ptr = dynamic_cast<const Type*>(iter.val());
 
         if (ptr)
         {
diff --git a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
index 7bee6513b5..33420c8346 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
@@ -135,10 +135,10 @@ Description
         {                                                                      \
             const auto& tbl = *prefix##TablePtr_;                              \
             auto iter = tbl.cfind(k);                                          \
-            if (!iter.found() && prefix##CompatTablePtr_)                      \
+            if (!iter.good() && prefix##CompatTablePtr_)                       \
             {                                                                  \
                 const auto altIter = prefix##CompatTablePtr_->cfind(k);        \
-                if (altIter.found())                                           \
+                if (altIter.good())                                            \
                 {                                                              \
                     const auto& alt = altIter.val();  /* <word,int> */         \
                     iter = tbl.cfind(alt.first);                               \
@@ -153,7 +153,7 @@ Description
                     }                                                          \
                 }                                                              \
             }                                                                  \
-            if (iter.found())                                                  \
+            if (iter.good())                                                   \
             {                                                                  \
                 return iter.val();                                             \
             }                                                                  \
diff --git a/src/OpenFOAM/expressions/exprDriver/exprDriverFunctions.C b/src/OpenFOAM/expressions/exprDriver/exprDriverFunctions.C
index 195eef4301..0df7706169 100644
--- a/src/OpenFOAM/expressions/exprDriver/exprDriverFunctions.C
+++ b/src/OpenFOAM/expressions/exprDriver/exprDriverFunctions.C
@@ -174,7 +174,7 @@ static void writeFuncsImpl
 
         const auto iter = tbl.cfind(entryName);
 
-        if (!iter.found())
+        if (!iter.good())
         {
             continue;
         }
diff --git a/src/OpenFOAM/expressions/exprDriver/exprDriverTemplates.C b/src/OpenFOAM/expressions/exprDriver/exprDriverTemplates.C
index 1d9c9f8403..511f3a1acc 100644
--- a/src/OpenFOAM/expressions/exprDriver/exprDriverTemplates.C
+++ b/src/OpenFOAM/expressions/exprDriver/exprDriverTemplates.C
@@ -117,7 +117,7 @@ const Foam::Function1<Type>* Foam::expressions::exprDriver::getFunction1Ptr
 
     const auto iter = tbl.cfind(name);
 
-    if (iter.found())
+    if (iter.good())
     {
         func = iter.val().get();
     }
diff --git a/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C b/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
index 9e3087599b..a8c7386a9e 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
+++ b/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
@@ -204,11 +204,11 @@ Foam::expressions::exprResultGlobals::get
     {
         const auto tableIter = variables_.cfind(scopeName);
 
-        if (tableIter.found())
+        if (tableIter.good())
         {
             const auto resultIter = (*tableIter).cfind(name);
 
-            if (resultIter.found())
+            if (resultIter.good())
             {
                 return *(*resultIter);
             }
@@ -240,7 +240,7 @@ Foam::expressions::exprResultGlobals::addValue
 
     auto iter = tbl.find(name);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         tbl.set(name, new exprResult(value));
         iter = tbl.find(name);
@@ -322,7 +322,7 @@ bool Foam::expressions::exprResultGlobals::removeValue
 {
     auto iter = variables_.find(scope);
 
-    return (iter.found() && (*iter).erase(name));
+    return (iter.good() && iter.val().erase(name));
 }
 
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index a0f2576ed1..9c5f09ddfa 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -626,7 +626,7 @@ Foam::word Foam::argList::optionCompat(const word& optName)
     {
         const auto fnd = validOptionsCompat.cfind(optName.substr(1));
 
-        if (fnd.found())
+        if (fnd.good())
         {
             const auto& alt = fnd.val();
 
@@ -661,7 +661,7 @@ int Foam::argList::optionIgnore(const word& optName)
     {
         const auto fnd = ignoreOptionsCompat.cfind(optName);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             const auto& alt = fnd.val();
 
@@ -790,7 +790,7 @@ void Foam::argList::setCasePaths()
 
     const auto optIter = options_.cfind("case");  // [-case dir] specified?
 
-    if (optIter.found())
+    if (optIter.good())
     {
         caseDir = fileName::validate(optIter.val());  // includes 'clean'
 
@@ -932,8 +932,8 @@ Foam::argList::argList
             auto optIter = validOptions.cfind(optName);
             if
             (
-                optIter.found()
-             || (optIter = validParOptions.cfind(optName)).found()
+                optIter.good()
+             || (optIter = validParOptions.cfind(optName)).good()
             )
             {
                 wantArg = !optIter.val().empty();
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index 9816c4fe56..62a485d85b 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -453,7 +453,7 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
 
         const auto iter = procsDirs_.cfind(procPath);
 
-        if (iter.found())
+        if (iter.good())
         {
             return iter.val();
         }
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 7f3563edb5..df2c0822c8 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -257,7 +257,7 @@ Foam::fileOperations::masterUncollatedFileOperation::filePathInfo
         // directory is 0.01 (due to different time formats)
         const auto pathFnd = times_.cfind(io.time().path());
 
-        if (search && pathFnd.found())
+        if (search && pathFnd.good())
         {
             newInstancePath = findInstancePath
             (
@@ -2184,7 +2184,7 @@ Foam::instantList Foam::fileOperations::masterUncollatedFileOperation::findTimes
 ) const
 {
     const auto iter = times_.cfind(directory);
-    if (iter.found())
+    if (iter.good())
     {
         if (debug)
         {
@@ -2241,7 +2241,7 @@ void Foam::fileOperations::masterUncollatedFileOperation::setTime
 
     HashPtrTable<DynamicList<instant>>::iterator iter = times_.find(tm.path());
 
-    if (iter.found())
+    if (iter.good())
     {
         DynamicList<instant>& times = *(iter.val());
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index fa64f1db63..255c6a4389 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -684,7 +684,7 @@ void Foam::GAMGAgglomeration::calculateRegionMaster
         const label coarsei = procAgglomMap[proci];
 
         auto iter = agglomToMaster.find(coarsei);
-        if (iter.found())
+        if (iter.good())
         {
             iter.val() = min(iter.val(), proci);
         }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 937aecdbbb..994c8792f8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -127,7 +127,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
 
         const auto fnd = cellsToCoarseFace.cfind(cellPair);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // Already have coarse face
             dynFaceRestrictAddressing.append(fnd.val());
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index eeb7807c9a..602511a176 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -115,7 +115,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
 
         const auto fnd = cellsToCoarseFace.cfind(cellPair);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // Already have coarse face
             dynFaceRestrictAddressing.append(fnd.val());
diff --git a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
index 0cbb2f251a..fd2f6828a1 100644
--- a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
+++ b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
@@ -51,7 +51,7 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
 
     const auto fnd = pbm.groupPatchIDs().cfind(name());
 
-    if (!fnd.found())
+    if (!fnd.good())
     {
         if (&mesh == &thisPatch.boundaryMesh().mesh())
         {
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
index 8f0c928b39..acc6007b98 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
@@ -776,7 +776,7 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
                         const auto fnd =
                             mergedMap.cfind(edge(agglom0, agglom1));
 
-                        if (fnd.found())
+                        if (fnd.good())
                         {
                             const labelPairList& elems = fnd();
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
index c78c143e03..5d455e3bf6 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
@@ -96,7 +96,7 @@ Foam::label Foam::cellMatcher::calcLocalFaces
             const label vertI = f[localVertI];
 
             const auto iter = localPoint_.cfind(vertI);
-            if (iter.found())
+            if (iter.good())
             {
                 // Reuse local vertex number.
                 localFace[localVertI] = iter.val();
diff --git a/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H b/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
index 7ed69b1e04..fe8a2c1842 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
@@ -93,10 +93,13 @@ public:
         }
 
         //- Does the opposite face exist?
-        bool found() const noexcept
+        bool good() const noexcept
         {
             return oppositeIndex_ >= 0;
         }
+
+        //- Does the opposite face exist?
+        bool found() const noexcept { return good(); }
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 4cd6e6f2e6..f48ba801e3 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -257,7 +257,7 @@ void Foam::globalMeshData::countSharedEdges
 
         auto globalFnd = globalShared.find(e);
 
-        if (globalFnd.found())
+        if (globalFnd.good())
         {
             if (globalFnd() == -1)
             {
@@ -328,11 +328,11 @@ void Foam::globalMeshData::calcSharedEdges() const
 
         const auto e0Fnd = meshToShared.cfind(e[0]);
 
-        if (e0Fnd.found())
+        if (e0Fnd.good())
         {
             const auto e1Fnd = meshToShared.cfind(e[1]);
 
-            if (e1Fnd.found())
+            if (e1Fnd.good())
             {
                 // Found edge which uses shared points. Probably shared.
 
@@ -346,7 +346,7 @@ void Foam::globalMeshData::calcSharedEdges() const
 
                 auto iter = localShared.find(sharedEdge);
 
-                if (!iter.found())
+                if (!iter.good())
                 {
                     // First occurrence of this point combination. Store.
                     localShared.insert(sharedEdge, labelList(1, edgeI));
@@ -463,7 +463,7 @@ void Foam::globalMeshData::calcSharedEdges() const
 
         const auto edgeFnd = globalShared.cfind(e);
 
-        if (edgeFnd.found())
+        if (edgeFnd.good())
         {
             // My local edge is indeed a shared one. Go through all local edge
             // labels with this point combination.
@@ -1225,7 +1225,7 @@ void Foam::globalMeshData::calcPointBoundaryFaces
                 forAll(f, fp)
                 {
                     const auto iter = meshPointMap.cfind(f[fp]);
-                    if (iter.found())
+                    if (iter.good())
                     {
                         nPointFaces[iter.val()]++;
                     }
@@ -1260,7 +1260,7 @@ void Foam::globalMeshData::calcPointBoundaryFaces
                 {
                     const auto iter = meshPointMap.cfind(f[fp]);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         label bFacei =
                              pp.start() + i - mesh_.nInternalFaces();
@@ -1497,7 +1497,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
             const label celli = pCells[i];
             const auto fnd = meshCellMap.cfind(celli);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 bCells[i] = fnd();
             }
@@ -2514,7 +2514,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
 
         const auto iter = cpp.meshPointMap().cfind(meshPointi);
 
-        if (iter.found())
+        if (iter.good())
         {
             patchToCoupled[patchPointi] = iter();
             coupledToGlobalPatch[iter()] = globalPPoints.toGlobal(patchPointi);
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index e500f48636..f34b7c542d 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -281,7 +281,7 @@ bool Foam::globalPoints::mergeInfo
     // Get the index into the procPoints list.
     const auto iter = meshToProcPoint_.cfind(localPointi);
 
-    if (iter.found())
+    if (iter.good())
     {
         if (mergeInfo(nbrInfo, localPointi, procPoints_[iter.val()]))
         {
@@ -330,7 +330,7 @@ bool Foam::globalPoints::storeInitialInfo
     // Get the index into the procPoints list.
     const auto iter = meshToProcPoint_.find(localPointi);
 
-    if (iter.found())
+    if (iter.good())
     {
         if (mergeInfo(nbrInfo, localPointi, procPoints_[iter.val()]))
         {
@@ -683,7 +683,7 @@ void Foam::globalPoints::receivePatchPoints
                     // Do we have information on pointA?
                     const auto procPointA = meshToProcPoint_.cfind(localA);
 
-                    if (procPointA.found())
+                    if (procPointA.good())
                     {
                         const labelPairList infoA = addSendTransform
                         (
@@ -700,7 +700,7 @@ void Foam::globalPoints::receivePatchPoints
                     // Same for info on pointB
                     const auto procPointB = meshToProcPoint_.cfind(localB);
 
-                    if (procPointB.found())
+                    if (procPointB.good())
                     {
                         const labelPairList infoB = addSendTransform
                         (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 5b1670067d..5f7e691c76 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -353,7 +353,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
 
                 auto fnd = pointsToEdge.find(meshEdge);
 
-                if (!fnd.found())
+                if (!fnd.good())
                 {
                     // First occurrence of mesh edge. Store patch and my
                     // local index.
@@ -672,7 +672,7 @@ Foam::labelList Foam::polyBoundaryMesh::indices
         {
             const auto iter = groupPatchIDs().cfind(matcher);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Hash ids associated with the group
                 ids.insert(iter.val());
@@ -894,7 +894,7 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
             {
                 const auto iter = groupPatchIDs().cfind(matcher);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     // Hash ids associated with the group
                     ids.insert(iter.val());
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 771d2f3170..b64c0b6ee4 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -1135,10 +1135,10 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
 
                 // Convert edge end points to corresponding points on B side.
                 const auto fnd0 = aToB.cfind(e[0]);
-                if (fnd0.found())
+                if (fnd0.good())
                 {
                     const auto fnd1 = aToB.cfind(e[1]);
-                    if (fnd1.found())
+                    if (fnd1.good())
                     {
                         edgeMap.insert(edge(fnd0(), fnd1()), edgeI);
                     }
@@ -1168,7 +1168,7 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
                 // Look up A edge from HashTable.
                 auto iter = edgeMap.find(e);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     const label edgeA = iter.val();
                     const edge& eA = edges()[edgeA];
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 524ef8746a..1db719cc37 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -46,7 +46,7 @@ void Foam::syncTools::combine
 {
     auto iter = pointValues.find(index);
 
-    if (iter.found())
+    if (iter.good())
     {
         cop(*iter, val);
     }
@@ -68,7 +68,7 @@ void Foam::syncTools::combine
 {
     auto iter = edgeValues.find(index);
 
-    if (iter.found())
+    if (iter.good())
     {
         cop(*iter, val);
     }
@@ -111,7 +111,7 @@ void Foam::syncTools::syncPointMap
         {
             const auto fnd = pointValues.cfind(sharedPtLabels[i]);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 combine
                 (
@@ -153,7 +153,7 @@ void Foam::syncTools::syncPointMap
                 {
                     const auto iter = pointValues.cfind(meshPts[i]);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         patchInfo.insert(nbrPts[i], *iter);
                     }
@@ -227,14 +227,14 @@ void Foam::syncTools::syncPointMap
 
                 const auto point0Fnd = pointValues.cfind(meshPtsA[e[0]]);
 
-                if (point0Fnd.found())
+                if (point0Fnd.good())
                 {
                     half0Values.insert(i, *point0Fnd);
                 }
 
                 const auto point1Fnd = pointValues.cfind(meshPtsB[e[1]]);
 
-                if (point1Fnd.found())
+                if (point1Fnd.good())
                 {
                     half1Values.insert(i, *point1Fnd);
                 }
@@ -250,7 +250,7 @@ void Foam::syncTools::syncPointMap
 
                 const auto half0Fnd = half0Values.cfind(i);
 
-                if (half0Fnd.found())
+                if (half0Fnd.good())
                 {
                     combine
                     (
@@ -263,7 +263,7 @@ void Foam::syncTools::syncPointMap
 
                 const auto half1Fnd = half1Values.cfind(i);
 
-                if (half1Fnd.found())
+                if (half1Fnd.good())
                 {
                     combine
                     (
@@ -340,7 +340,7 @@ void Foam::syncTools::syncPointMap
             // Do I have a value for my shared point
             const auto sharedFnd = sharedPointValues.cfind(iter.key());
 
-            if (sharedFnd.found())
+            if (sharedFnd.good())
             {
                 pointValues.set(*iter, *sharedFnd);
             }
@@ -397,7 +397,7 @@ void Foam::syncTools::syncEdgeMap
 
                     const auto iter = edgeValues.cfind(meshEdge);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         const edge nbrEdge(nbrPts[e[0]], nbrPts[e[1]]);
                         patchInfo.insert(nbrEdge, *iter);
@@ -490,7 +490,7 @@ void Foam::syncTools::syncEdgeMap
 
                     const auto iter = edgeValues.cfind(meshEdge0);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         half0Values.insert(edgei, *iter);
                     }
@@ -501,7 +501,7 @@ void Foam::syncTools::syncEdgeMap
 
                     const auto iter = edgeValues.cfind(meshEdge1);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         half1Values.insert(edgei, *iter);
                     }
@@ -521,7 +521,7 @@ void Foam::syncTools::syncEdgeMap
 
                 const auto half1Fnd = half1Values.cfind(edgei);
 
-                if (half1Fnd.found())
+                if (half1Fnd.good())
                 {
                     const edge& e0 = edgesA[twoEdges[0]];
                     const edge meshEdge0(meshPtsA[e0[0]], meshPtsA[e0[1]]);
@@ -537,7 +537,7 @@ void Foam::syncTools::syncEdgeMap
 
                 const auto half0Fnd = half0Values.cfind(edgei);
 
-                if (half0Fnd.found())
+                if (half0Fnd.good())
                 {
                     const edge& e1 = edgesB[twoEdges[1]];
                     const edge meshEdge1(meshPtsB[e1[0]], meshPtsB[e1[1]]);
@@ -591,11 +591,11 @@ void Foam::syncTools::syncEdgeMap
 
             const auto v0Fnd = meshToShared.cfind(v0);
 
-            if (v0Fnd.found())
+            if (v0Fnd.good())
             {
                 const auto v1Fnd = meshToShared.cfind(v1);
 
-                if (v1Fnd.found())
+                if (v1Fnd.good())
                 {
                     const edge meshEdge(v0, v1);
 
@@ -607,7 +607,7 @@ void Foam::syncTools::syncEdgeMap
 
                     const auto edgeFnd = edgeValues.cfind(meshEdge);
 
-                    if (edgeFnd.found())
+                    if (edgeFnd.good())
                     {
                         // edge exists in edgeValues. See if already in map
                         // (since on same processor, e.g. cyclic)
@@ -683,7 +683,7 @@ void Foam::syncTools::syncEdgeMap
         // Do I have a value for the shared edge?
         const auto sharedFnd = sharedEdgeValues.cfind(sharedEdge);
 
-        if (sharedFnd.found())
+        if (sharedFnd.good())
         {
             combine
             (
@@ -747,7 +747,7 @@ void Foam::syncTools::syncPointList
     {
         const auto iter = mpm.cfind(meshPoints[i]);
 
-        if (iter.found())
+        if (iter.good())
         {
             cppFld[*iter] = pointValues[i];
         }
@@ -768,7 +768,7 @@ void Foam::syncTools::syncPointList
     {
         const auto iter = mpm.cfind(meshPoints[i]);
 
-        if (iter.found())
+        if (iter.good())
         {
             pointValues[i] = cppFld[*iter];
         }
@@ -906,7 +906,7 @@ void Foam::syncTools::syncEdgeList
     {
         const label meshEdgei = meshEdges[i];
         const auto iter = mpm.cfind(meshEdgei);
-        if (iter.found())
+        if (iter.good())
         {
             const label cppEdgei = iter();
             const edge& cppE = cppEdges[cppEdgei];
@@ -951,8 +951,8 @@ void Foam::syncTools::syncEdgeList
     forAll(meshEdges, i)
     {
         label meshEdgei = meshEdges[i];
-        Map<label>::const_iterator iter = mpm.find(meshEdgei);
-        if (iter != mpm.end())
+        const auto iter = mpm.cfind(meshEdgei);
+        if (iter.good())
         {
             label cppEdgei = iter();
             const edge& cppE = cppEdges[cppEdgei];
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 9e4c191c6e..c21094d9e6 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -428,7 +428,7 @@ Foam::labelList Foam::ZoneMesh<ZoneType, MeshType>::indices
         {
             const auto iter = groupZoneIDs().cfind(matcher);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Hash ids associated with the group
                 ids.insert(iter.val());
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
index 115832ff97..1388fe54ea 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
@@ -55,7 +55,7 @@ void Foam::PatchTools::matchPoints
 
         const auto iter = p2.meshPointMap().cfind(meshPointi);
 
-        if (iter.found())
+        if (iter.good())
         {
             p1PointLabels[nMatches] = pointi;
             p2PointLabels[nMatches] = iter.val();
@@ -103,7 +103,7 @@ void Foam::PatchTools::matchEdges
 
         const auto iter = edgeToIndex.cfind(meshEdge2);
 
-        if (iter.found())
+        if (iter.good())
         {
             p1EdgeLabels[nMatches] = iter.val();
             p2EdgeLabels[nMatches] = edgei;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
index f99a940bf9..3fa499ddc5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
@@ -64,7 +64,7 @@ Foam::PatchTools::pointNormals
             const label meshPointi = p.meshPoints()[patchPointi];
 
             const auto fnd = coupledPatchMP.cfind(meshPointi);
-            if (fnd.found())
+            if (fnd.good())
             {
                 const label coupledPointi = fnd.val();
 
@@ -181,7 +181,7 @@ Foam::PatchTools::pointNormals
         const label meshPointi = p.meshPoints()[patchPointi];
 
         const auto fnd = coupledPatchMP.cfind(meshPointi);
-        if (fnd.found())
+        if (fnd.good())
         {
             const label coupledPointi = fnd.val();
             extrudeN[patchPointi] = coupledPointNormals[coupledPointi];
diff --git a/src/OpenFOAM/primitives/enums/NamedEnum.C b/src/OpenFOAM/primitives/enums/NamedEnum.C
index f98ab8ca8f..3bbf71ee98 100644
--- a/src/OpenFOAM/primitives/enums/NamedEnum.C
+++ b/src/OpenFOAM/primitives/enums/NamedEnum.C
@@ -97,7 +97,7 @@ Foam::List<int> Foam::NamedEnum<EnumType, nEnum>::values() const
         {
             auto iter = lookup_.cfind(names[enumi]);
 
-            if (iter.found())
+            if (iter.good())
             {
                 lst[count++] = iter.val();
             }
@@ -135,7 +135,7 @@ EnumType Foam::NamedEnum<EnumType, nEnum>::lookup
     const word enumName(dict.lookup(key));
     auto iter = lookup_.cfind(enumName);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalIOErrorInFunction(dict)
             << enumName << " is not in enumeration: "
@@ -170,7 +170,7 @@ EnumType Foam::NamedEnum<EnumType, nEnum>::read(Istream& is) const
     const word enumName(is);
     auto iter = lookup_.cfind(enumName);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalIOErrorInFunction(is)
             << enumName << " is not in enumeration: "
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index 7947676d98..b6187ab323 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -804,7 +804,7 @@ void Foam::stringOps::inplaceExpand
 
                 const auto fnd = mapping.cfind(varName);
 
-                if (fnd.found() ? (altType == '+') : (altType == '-'))
+                if (fnd.good() ? (altType == '+') : (altType == '-'))
                 {
                     // Found and ":+" alternative
                     // Not-found and ":-" alternative
@@ -812,7 +812,7 @@ void Foam::stringOps::inplaceExpand
                     s.replace(varBeg, varEnd - varBeg + 1, altValue);
                     varBeg += altValue.size();
                 }
-                else if (fnd.found())
+                else if (fnd.good())
                 {
                     // Found: use value
                     s.replace(varBeg, varEnd - varBeg + 1, *fnd);
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 076c03a1c0..ea01c4a316 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -734,7 +734,7 @@ void Foam::PstreamDetail::allToAllConsensus
     {
         // Do myself
         const auto iter = sendBufs.find(myProci);
-        if (iter.found() && (iter.val() != zeroValue))
+        if (iter.good() && (iter.val() != zeroValue))
         {
             // Do myself: insert_or_assign
             recvBufs(iter.key()) = iter.val();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 168c538e66..4cf128963e 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -111,7 +111,7 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
     {
         auto ctorIter = additionalConstructors.cfind(deltaType);
 
-        if (ctorIter.found())
+        if (ctorIter.good())
         {
             return autoPtr<LESdelta>(ctorIter.val()(name, turbulence, dict));
         }
diff --git a/src/combustionModels/combustionModel/combustionModelTemplates.C b/src/combustionModels/combustionModel/combustionModelTemplates.C
index 7473db0270..a7b2c3737f 100644
--- a/src/combustionModels/combustionModel/combustionModelTemplates.C
+++ b/src/combustionModels/combustionModel/combustionModelTemplates.C
@@ -90,12 +90,12 @@ Foam::autoPtr<CombustionModel> Foam::combustionModel::New
 
     auto ctorIter = cnstrTable.cfind(thermoCombModelName);
 
-    if (!ctorIter.found())
+    if (!ctorIter.good())
     {
         ctorIter = cnstrTable.cfind(compCombModelName);
     }
 
-    if (!ctorIter.found())
+    if (!ctorIter.good())
     {
         const wordList names(cnstrTable.sortedToc());
 
diff --git a/src/conversion/ccm/reader/ccmReaderAux.C b/src/conversion/ccm/reader/ccmReaderAux.C
index 3031b000d6..6e996963f3 100644
--- a/src/conversion/ccm/reader/ccmReaderAux.C
+++ b/src/conversion/ccm/reader/ccmReaderAux.C
@@ -79,7 +79,7 @@ void Foam::ccm::reader::warnDuplicates
     {
         // Check duplicate names
         auto iter = hashed.find(item);
-        if (iter.found())
+        if (iter.good())
         {
             (*iter)++;
             duplicates = true;
diff --git a/src/conversion/ccm/reader/ccmReaderMesh.C b/src/conversion/ccm/reader/ccmReaderMesh.C
index db3087240e..9d8099de14 100644
--- a/src/conversion/ccm/reader/ccmReaderMesh.C
+++ b/src/conversion/ccm/reader/ccmReaderMesh.C
@@ -479,7 +479,7 @@ void Foam::ccm::reader::readCells
 
         // Lookup the name, type from boundary region info:
         auto dictIter = boundaryRegion_.find(info.ccmIndex);
-        if (dictIter.found())
+        if (dictIter.good())
         {
             dictionary& dict = dictIter.val();
 
@@ -1037,7 +1037,7 @@ void Foam::ccm::reader::readMonitoring
             auto iter = boundaryRegion_.cfind(ccmRegionId);
 
             word zoneName;
-            if (iter.found())
+            if (iter.good())
             {
                 iter().readEntry("Label", zoneName);
             }
@@ -2435,7 +2435,7 @@ void Foam::ccm::reader::addPatches
 
         auto citer = boundaryRegion_.cfind(origBndId_[patchI]);
 
-        if (citer.found())
+        if (citer.good())
         {
             citer().readEntry("Label", patchName);
             citer().readEntry("BoundaryType", patchType);
diff --git a/src/conversion/common/reader/meshReaderAux.C b/src/conversion/common/reader/meshReaderAux.C
index 0aef54aad5..e81e14149a 100644
--- a/src/conversion/common/reader/meshReaderAux.C
+++ b/src/conversion/common/reader/meshReaderAux.C
@@ -46,7 +46,7 @@ void Foam::meshReader::warnDuplicates
     {
         // Check duplicate name
         auto iter = hashed.find(w);
-        if (iter.found())
+        if (iter.good())
         {
             ++(*iter);
             duplicates = true;
diff --git a/src/conversion/common/tables/cellTable.C b/src/conversion/common/tables/cellTable.C
index 723d6743e3..607d253970 100644
--- a/src/conversion/common/tables/cellTable.C
+++ b/src/conversion/common/tables/cellTable.C
@@ -89,7 +89,7 @@ void Foam::cellTable::setEntry
     dict.add(keyWord, value);
 
     iterator iter = find(id);
-    if (iter.found())
+    if (iter.good())
     {
         iter().merge(dict);
     }
@@ -190,7 +190,7 @@ Foam::word Foam::cellTable::name(const label id) const
     word theName("cellTable_" + Foam::name(id));
 
     const_iterator iter = cfind(id);
-    if (iter.found())
+    if (iter.good())
     {
         iter().readIfPresent("Label", theName);
     }
@@ -301,7 +301,7 @@ void Foam::cellTable::setName(const label id)
 {
     iterator iter = find(id);
 
-    if (!iter.found() || !iter().found("Label"))
+    if (!iter.good() || !iter().found("Label"))
     {
         setName(id, "cellTable_" + Foam::name(id));
     }
@@ -448,7 +448,7 @@ void Foam::cellTable::addCellZones
     forAll(tableIds, celli)
     {
         const auto iter = typeToZone.cfind(tableIds[celli]);
-        if (iter.found())
+        if (iter.good())
         {
             zoneCells[*iter].append(celli);
         }
diff --git a/src/conversion/starcd/STARCDMeshReader.C b/src/conversion/starcd/STARCDMeshReader.C
index f021c5767a..b17252ac7d 100644
--- a/src/conversion/starcd/STARCDMeshReader.C
+++ b/src/conversion/starcd/STARCDMeshReader.C
@@ -718,7 +718,7 @@ void Foam::fileFormats::STARCDMeshReader::readBoundary
 
         auto iter = boundaryRegion_.cfind(origRegion[patchi]);
 
-        if (iter.found())
+        if (iter.good())
         {
             const dictionary& dict = *iter;
 
diff --git a/src/dynamicMesh/attachDetach/attachInterface.C b/src/dynamicMesh/attachDetach/attachInterface.C
index 8c4092a80b..70e996d297 100644
--- a/src/dynamicMesh/attachDetach/attachInterface.C
+++ b/src/dynamicMesh/attachDetach/attachInterface.C
@@ -207,7 +207,7 @@ void Foam::attachDetach::attachInterface
         {
             const auto rpmIter = removedPointMap.cfind(newFace[pointi]);
 
-            if (rpmIter.found())
+            if (rpmIter.good())
             {
                 // Point mapped. Replace it
                 newFace[pointi] = rpmIter();
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
index c70db89dfc..de879f7cd3 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.C
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.C
@@ -399,7 +399,7 @@ void Foam::createShellMesh::calcPointRegions
 
             const auto fnd = globalToLocalRegion.cfind(globalRegionI);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 // Already encountered this global region. Assign same local one
                 pRegions[fp] = fnd();
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 41462314aa..11960dd876 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -736,7 +736,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::mergeSharedPoints
         {
             const auto iter = globalMasterToLocalMaster.cfind(globali);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Matched to existing master
                 pointToMaster.insert(pointi, *iter);
@@ -1133,7 +1133,7 @@ void Foam::fvMeshDistribute::findCouples
 
             const auto iter = map.cfind(myData);
 
-            if (iter.found())
+            if (iter.good())
             {
                 label nbrBFacei = *iter;
 
@@ -1239,7 +1239,7 @@ void Foam::fvMeshDistribute::findCouples
                     );
                     auto fnd = map.find(key);
 
-                    if (!fnd.found())
+                    if (!fnd.good())
                     {
                         // Insert
                         map.emplace(key, meshi, bFacei);
diff --git a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
index d39775a7df..e04075d2e0 100644
--- a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
@@ -217,7 +217,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
         {
             const auto rpmIter = removedPointMap.cfind(newFace[pointi]);
 
-            if (rpmIter.found())
+            if (rpmIter.good())
             {
                 // Point mapped. Replace it
                 newFace[pointi] = rpmIter();
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index a7d06e6479..477f31d042 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -117,7 +117,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
         oppositeFace lidFace =
             cells[mc[facei]].opposingFace(mf[facei], faces);
 
-        if (!lidFace.found())
+        if (!lidFace.good())
         {
             // This is not a valid layer; cannot continue
             nFaceErrors++;
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index b3f3c15784..33a7b9bf72 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -181,7 +181,7 @@ void Foam::cellCuts::syncProc()
 
                     const auto iter = faceSplitCut_.cfind(facei);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         const face& f = mesh().faces()[facei];
                         const labelList& fEdges = mesh().faceEdges()[facei];
@@ -2109,7 +2109,7 @@ bool Foam::cellCuts::validLoop
 
             const auto iter = faceSplitCut_.cfind(meshFacei);
 
-            if (!iter.found())
+            if (!iter.good())
             {
                 // Face not yet cut so insert.
                 newFaceSplitCut.insert(meshFacei, cutEdge);
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index a6abda9e91..8d27e71951 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -102,7 +102,7 @@ Foam::face Foam::boundaryCutter::addEdgeCutsToFace
 
         const auto fnd = edgeToAddedPoints.cfind(edgeI);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // edge has been cut. Introduce new vertices. Check order.
             const labelList& addedPoints = fnd();
@@ -231,7 +231,7 @@ bool Foam::boundaryCutter::splitFace
 
         const auto fnd = edgeToAddedPoints.cfind(edgeI);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             nSplitEdges++;
             nTotalSplits += fnd().size();
@@ -467,7 +467,7 @@ void Foam::boundaryCutter::setRefinement
 
             auto fnd = edgeToAddedPoints.find(edgeI);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 labelList& addedPoints = fnd();
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index eaedcda3c2..239ec27dbd 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -485,7 +485,7 @@ Foam::face Foam::meshCutAndRemove::addEdgeCutsToFace(const label facei) const
         EdgeMap<label>::const_iterator fnd =
             addedPoints_.find(edge(f[fp], f[fp1]));
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // edge has been cut. Introduce new vertex.
             newFace[newFp++] = fnd.val();
@@ -547,7 +547,7 @@ Foam::face Foam::meshCutAndRemove::loopToFace
                     EdgeMap<label>::const_iterator fnd =
                         addedPoints_.find(mesh().edges()[edgeI]);
 
-                    if (fnd.found())
+                    if (fnd.good())
                     {
                         newFace[newFacei++] = fnd.val();
                     }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index a8da54e3eb..d79b6c5918 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -431,7 +431,7 @@ Foam::face Foam::meshCutter::addEdgeCutsToFace(const label facei) const
         EdgeMap<label>::const_iterator fnd =
             addedPoints_.find(edge(f[fp], f[fp1]));
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // edge has been cut. Introduce new vertex.
             newFace[newFp++] = fnd.val();
@@ -490,7 +490,7 @@ Foam::face Foam::meshCutter::loopToFace
                     EdgeMap<label>::const_iterator fnd =
                         addedPoints_.find(mesh().edges()[edgeI]);
 
-                    if (fnd.found())
+                    if (fnd.good())
                     {
                         newFace[newFacei++] = fnd.val();
                     }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index bfbd8f4f9e..42a5446c5a 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -68,7 +68,7 @@ void Foam::multiDirRefinement::addCells
 
         const auto iter = splitMap.cfind(refCell.cellNo());
 
-        if (!iter.found())
+        if (!iter.good())
         {
             FatalErrorInFunction
                 << "Problem : cannot find added cell for cell "
@@ -289,7 +289,7 @@ void Foam::multiDirRefinement::refineHex8
 
             auto iter = hexCellSet.find(celli);
 
-            if (iter.found())
+            if (iter.good())
             {
                 iter.val() = 2;
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 202cfb2595..c2a16e1a71 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -249,7 +249,7 @@ void Foam::undoableMeshCutter::setRefinement
             // Check if celli already part of split.
             auto findCell = liveSplitCells_.find(celli);
 
-            if (!findCell.found())
+            if (!findCell.good())
             {
                 // Celli not yet split. It cannot be unlive split cell
                 // since that would be illegal to split in the first
@@ -501,7 +501,7 @@ Foam::labelList Foam::undoableMeshCutter::removeSplitFaces
         auto ownFind = liveSplitCells_.find(own);
         auto nbrFind = liveSplitCells_.find(nbr);
 
-        if (ownFind.found() && nbrFind.found())
+        if (ownFind.good() && nbrFind.good())
         {
             // Face is original splitFace.
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index c8dcc7ea9e..d714ffa5f9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -69,7 +69,7 @@ Foam::displacementLayeredMotionMotionSolver::getCylindrical
 {
     auto iter = cylSystems_.cfind(cellZoneI);
 
-    if (iter.found())
+    if (iter.good())
     {
         return *(iter.val());
     }
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index effa13b496..7b4bc566a7 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -1286,7 +1286,7 @@ Foam::label Foam::faceCoupleInfo::matchEdgeFaces
                     // master faces.
                     auto fnd = candidates.find(cutFacei);
 
-                    if (!fnd.found())
+                    if (!fnd.good())
                     {
                         // No info yet for cutFacei. Add all master faces as
                         // candidates
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index c03ab28114..1a4d0e48c8 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -425,10 +425,10 @@ void Foam::polyMeshAdder::insertVertices
         // See if any edge between v0,v1
 
         const auto v0Fnd = meshToMaster.cfind(v0);
-        if (v0Fnd.found())
+        if (v0Fnd.good())
         {
             const auto v1Fnd = meshToMaster.cfind(v1);
-            if (v1Fnd.found())
+            if (v1Fnd.good())
             {
                 // Get edge in cutPoint numbering
                 edge cutEdge
@@ -439,7 +439,7 @@ void Foam::polyMeshAdder::insertVertices
 
                 const auto iter = cutEdgeToPoints.cfind(cutEdge);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     const edge& e = iter.key();
                     const labelList& addedPoints = iter.val();
@@ -2011,7 +2011,7 @@ Foam::Map<Foam::label> Foam::polyMeshAdder::findSharedPoints
 
         auto iter = sharedToMesh.find(sharedI);
 
-        if (iter.found())
+        if (iter.good())
         {
             // sharedI already used by other point. Add this one.
 
@@ -2202,7 +2202,7 @@ void Foam::polyMeshAdder::mergePoints
     {
         const auto iter = pointToMaster.cfind(pointi);
 
-        if (iter.found())
+        if (iter.good())
         {
             if (iter.val() != pointi)
             {
@@ -2227,7 +2227,7 @@ void Foam::polyMeshAdder::mergePoints
 
             const auto iter = pointToMaster.cfind(pointi);
 
-            if (iter.found())
+            if (iter.good())
             {
                 if (iter.val() != pointi)
                 {
@@ -2247,7 +2247,7 @@ void Foam::polyMeshAdder::mergePoints
 
                 const auto iter = pointToMaster.cfind(pointi);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     newF[fp] = iter.val();
                 }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 9db2a1d408..8802246e92 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -1959,7 +1959,7 @@ void Foam::addPatchCellLayer::setRefinement
                     forAll(f, fp)
                     {
                         const auto fnd = minPointValue.find(f[fp]);
-                        if (fnd.found())
+                        if (fnd.good())
                         {
                             baseF.setSize(f.size(), labelMax);
                             if (baseF[fp] == labelMax)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 21e5944423..3a7c096bff 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -256,7 +256,7 @@ bool Foam::combineFaces::faceNeighboursValid
 
                 const auto iter = faceRegion.cfind(nbrI);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     neighbourRegions.insert(iter.val());
                 }
@@ -346,7 +346,7 @@ Foam::labelListList Foam::combineFaces::getMergeSets
 
                 auto regionFnd = regionToFaces.find(region);
 
-                if (regionFnd.found())
+                if (regionFnd.good())
                 {
                     labelList& setFaces = regionFnd();
                     label sz = setFaces.size();
@@ -890,7 +890,7 @@ void Foam::combineFaces::setUnrefinement
 
         const auto iter = masterToSet.cfind(masterFacei);
 
-        if (!iter.found())
+        if (!iter.good())
         {
             FatalErrorInFunction
                 << "Master face " << masterFacei
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 69a5bce97d..e1986b0962 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -970,7 +970,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
 
     auto edgeMidFnd = midPointToAnchors.find(edgeMidPointi);
 
-    if (!edgeMidFnd.found())
+    if (!edgeMidFnd.good())
     {
         midPointToAnchors.insert(edgeMidPointi, edge(anchorPointi, -1));
     }
@@ -997,7 +997,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
 
     auto faceMidFnd = midPointToFaceMids.find(edgeMidPointi);
 
-    if (!faceMidFnd.found())
+    if (!faceMidFnd.good())
     {
         midPointToFaceMids.insert(edgeMidPointi, edge(faceMidPointi, -1));
     }
@@ -1844,7 +1844,7 @@ bool Foam::hexRef8::matchHexShape
                     {
                         auto iter = pointFaces.find(pointi);
 
-                        if (iter.found())
+                        if (iter.good())
                         {
                             labelList& pFaces = iter.val();
                             pFaces.appendUniq(facei);
@@ -4313,7 +4313,7 @@ void Foam::hexRef8::updateMesh
 
             const auto fnd = savedCellLevel_.cfind(storedCelli);
 
-            if (!fnd.found())
+            if (!fnd.good())
             {
                 FatalErrorInFunction
                     << "Problem : trying to restore old value for new cell "
@@ -4386,7 +4386,7 @@ void Foam::hexRef8::updateMesh
 
             auto fnd = savedPointLevel_.find(storedPointi);
 
-            if (!fnd.found())
+            if (!fnd.good())
             {
                 FatalErrorInFunction
                     << "Problem : trying to restore old value for new point "
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index f7c9e36ed3..b5ecbd25fd 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -363,7 +363,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                         // Increment the usage count using two hash sets
                         auto euoIter = edgesUsedOnce.find(curCutFaceEdge);
 
-                        if (!euoIter.found())
+                        if (!euoIter.good())
                         {
                             // Pout<< "Found edge not used before: "
                             //     << curCutFaceEdge
@@ -439,7 +439,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 
                         bool otherSideFound = false;
 
-                        if (mpfAddrIter.found())
+                        if (mpfAddrIter.good())
                         {
                             bool miss = false;
 
@@ -461,7 +461,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                                         cutFaceGlobal[pointi]
                                     );
 
-                                if (!mpfAddrPointIter.found())
+                                if (!mpfAddrPointIter.good())
                                 {
                                     // Point is off the master patch. Skip
                                     miss = true;
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 896c6a37b8..52e3b233fa 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -445,7 +445,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
             // Try to find the cut point in retired points
             const auto rpmIter = rpm.cfind(pointi);
 
-            if (rpmIter.found())
+            if (rpmIter.good())
             {
                 if (debug)
                 {
@@ -463,7 +463,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
 
                 const auto cpepmIter = cpepm.cfind(pointi);
 
-                if (cpepmIter.found())
+                if (cpepmIter.good())
                 {
                     // Pout<< "Need to re-create hit for point "
                     //     << cutPoints[pointi]
diff --git a/src/fileFormats/abaqus/ABAQUSCore.C b/src/fileFormats/abaqus/ABAQUSCore.C
index bc478cfa06..b9c685b34d 100644
--- a/src/fileFormats/abaqus/ABAQUSCore.C
+++ b/src/fileFormats/abaqus/ABAQUSCore.C
@@ -459,7 +459,7 @@ Foam::fileFormats::ABAQUSCore::readHelper::readSurfaceElements
         }
 
         const auto faceIdIter = abqToFoamFaceMap.cfind(elemTypes_[index]);
-        if (!faceIdIter.found())
+        if (!faceIdIter.good())
         {
             Info<< "Abaqus reader: reject non-solid shape: " << nl;
         }
diff --git a/src/fileFormats/stl/STLAsciiParseI.H b/src/fileFormats/stl/STLAsciiParseI.H
index 7a0491d5be..c20ebf7455 100644
--- a/src/fileFormats/stl/STLAsciiParseI.H
+++ b/src/fileFormats/stl/STLAsciiParseI.H
@@ -35,7 +35,7 @@ inline void Foam::Detail::STLAsciiParse::beginSolid(word solidName)
     }
 
     auto iter = nameLookup_.cfind(solidName);
-    if (iter.found())
+    if (iter.good())
     {
         if (groupId_ != iter.val())
         {
diff --git a/src/fileFormats/stl/STLReader.C b/src/fileFormats/stl/STLReader.C
index 60cb4e84c1..e0597319eb 100644
--- a/src/fileFormats/stl/STLReader.C
+++ b/src/fileFormats/stl/STLReader.C
@@ -131,7 +131,7 @@ bool Foam::fileFormats::STLReader::readBINARY
         const label origId = stlTri.attrib();
 
         auto fnd = lookup.cfind(origId);
-        if (fnd.found())
+        if (fnd.good())
         {
             if (zoneI != *fnd)
             {
diff --git a/src/fileFormats/vtk/file/foamVtkSeriesWriter.C b/src/fileFormats/vtk/file/foamVtkSeriesWriter.C
index c5539f3957..f333e6b437 100644
--- a/src/fileFormats/vtk/file/foamVtkSeriesWriter.C
+++ b/src/fileFormats/vtk/file/foamVtkSeriesWriter.C
@@ -280,7 +280,7 @@ bool Foam::vtk::seriesWriter::appendCheck(fileNameInstant inst)
 
     const auto iter = existing_.find(inst.name());
 
-    if (iter.found())
+    if (iter.good())
     {
         for (fileNameInstant& dst : entries_)
         {
@@ -320,7 +320,7 @@ bool Foam::vtk::seriesWriter::removeDuplicates()
         {
             auto iter = filesSeen.find(inst.name());
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Mark previous location as being superseded
                 entries_[*iter].name().clear();
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
index 7bd8ad7ca9..9dee45cd56 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
@@ -509,7 +509,7 @@ Foam::labelList Foam::faBoundaryMesh::indices
         {
             const auto iter = groupPatchIDs().cfind(matcher);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Hash ids associated with the group
                 ids.insert(iter.val());
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
index c890385278..32cf1d0013 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
@@ -513,7 +513,7 @@ Foam::fvMeshSubset::interpolate
 
                 const auto iter = meshPointMap.cfind(meshPointi);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     directAddressing[localI] = *iter;
                 }
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index 66fe8239a9..6455384cc7 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -116,7 +116,7 @@ void Foam::singleCellFvMesh::agglomerateMesh
 
                     const auto iter = localToNbr.cfind(myZone);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         // Check that zone numbers are still the same.
                         if (iter.val() != nbrZone)
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
index 401a697e89..0aba815147 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
@@ -116,7 +116,7 @@ void Foam::pointConstraints::makePatchPatchAddressing()
 
                 label constraintI = -1;
 
-                if (iter.found())
+                if (iter.good())
                 {
                     constraintI = iter.val();
                 }
@@ -174,7 +174,7 @@ void Foam::pointConstraints::makePatchPatchAddressing()
 
                     const auto iter = cpPointMap.cfind(ppp);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         // Can just copy (instead of apply) constraint
                         // will already be consistent across multiple patches.
@@ -225,7 +225,7 @@ void Foam::pointConstraints::makePatchPatchAddressing()
 
                 label constraintI = -1;
 
-                if (iter.found())
+                if (iter.good())
                 {
                     //Pout<< indent << "on meshpoint:" << meshPointi
                     //    << " coupled:" << coupledPointi
diff --git a/src/functionObjects/field/binField/binModels/binModel/binModelNew.C b/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
index 2447b09919..9d09a4ebf8 100644
--- a/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
+++ b/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
@@ -41,7 +41,7 @@ Foam::autoPtr<Foam::binModel> Foam::binModel::New
 
     auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-    if (!cstrIter.found())
+    if (!cstrIter.good())
     {
         FatalIOErrorInLookup
         (
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index d2a16eeb98..d2c5982d6c 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -607,7 +607,7 @@ bool Foam::functionObjects::externalCoupled::read(const dictionary& dict)
             const wordList writeFields(groupDict.get<wordList>("writeFields"));
 
             auto fnd = regionToGroups_.find(regionGroupNames_.last());
-            if (fnd.found())
+            if (fnd.good())
             {
                 fnd().append(nGroups);
             }
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeControl.C b/src/functionObjects/utilities/runTimeControl/runTimeControl.C
index 07e89e5383..673eaee2ae 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeControl.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeControl.C
@@ -211,7 +211,7 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
 
             auto conditionIter = groupMap_.cfind(groupi);
 
-            if (!conditionIter.found())
+            if (!conditionIter.good())
             {
                 FatalErrorInFunction
                     << "group " << groupi << " not found in map"
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index a9cb925422..1011eb1823 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -272,7 +272,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 
         tmp<DimensionedField<Type, volMesh>> tsu;
 
-        if (iter1.found())
+        if (iter1.good())
         {
             const auto& valueExpr = iter1.val();
 
@@ -357,7 +357,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
                 }
             }
         }
-        else if (iter2.found() && iter2.val()->good())
+        else if (iter2.good() && iter2.val()->good())
         {
             const dimensioned<Type> SuValue
             (
@@ -400,7 +400,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 
         tmp<DimensionedField<scalar, volMesh>> tsp;
 
-        if (iter1.found())
+        if (iter1.good())
         {
             const auto& valueExpr = iter1.val();
 
@@ -483,7 +483,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
                 }
             }
         }
-        else if (iter2.found() && iter2.val()->good())
+        else if (iter2.good() && iter2.val()->good())
         {
             const dimensioned<scalar> SpValue
             (
diff --git a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C b/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
index 5108533f98..ae032898ae 100644
--- a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
+++ b/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
@@ -496,7 +496,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.scalarFields_.cfind(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
@@ -506,7 +506,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.vectorFields_.cfind(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
@@ -516,7 +516,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.sphTensorFields_.cfind(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
@@ -526,7 +526,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.symmTensorFields_.cfind(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
@@ -536,7 +536,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.tensorFields_.find(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
index 4edf8770ec..baa9e9ecad 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
@@ -409,7 +409,7 @@ Foam::blockMesh::mesh(const IOobject& io) const
 
                 label zonei = freeZonei;
 
-                if (iter.found())
+                if (iter.good())
                 {
                     zonei = *iter;
                 }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 397fb18255..b6f279b490 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1376,7 +1376,7 @@ Foam::label Foam::meshRefinement::splitFacesUndo
 
                 const auto oldFaceFnd = splitFaceToIndex.cfind(oldFacei);
 
-                if (oldFaceFnd.found())
+                if (oldFaceFnd.good())
                 {
                     labelPair& twoFaces = facePairs[oldFaceFnd.val()];
                     if (twoFaces[0] == -1)
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
index 1778e5b630..c1141c9e4a 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
@@ -320,7 +320,7 @@ void Foam::meshRefinement::growSet
 //    if (!isMultiRegion[celli])
 //    {
 //        Map<FixedList<label, 3>>::iterator fnd = cellToRegions.find(celli);
-//        if (!fnd.found())
+//        if (!fnd.good())
 //        {
 //            cellToRegions.insert(celli, surface);
 //        }
@@ -1772,8 +1772,8 @@ void Foam::meshRefinement::selectIntersectedFaces
 //        const edge& e = edges[edgei];
 //        const edge meshE = edge(mp[e[0]], mp[e[1]]);
 //
-//        EdgeMap<label>::const_iterator iter = edgeMap.find(meshE);
-//        if (iter.found())
+//        const auto iter = edgeMap.cfind(meshE);
+//        if (iter.good())
 //        {
 //            initialEdges.append(edgei);
 //            initialEdgesInfo.append
@@ -1781,7 +1781,7 @@ void Foam::meshRefinement::selectIntersectedFaces
 //                edgeTopoDistanceData<label, uindirectPrimitivePatch>
 //                (
 //                    0,          // distance
-//                    iter()      // globalFacei
+//                    iter.val()  // globalFacei
 //                )
 //            );
 //        }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 77baff46e5..6297c58f2f 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -1376,7 +1376,7 @@ void Foam::snappyLayerDriver::determineSidePatches
         {
             label patchi = edgePatchID[i];
             const auto fnd = wantedToAddedPatch.cfind(patchi);
-            if (fnd.found())
+            if (fnd.good())
             {
                 edgePatchID[i] = fnd.val();
             }
@@ -1968,7 +1968,7 @@ void Foam::snappyLayerDriver::getPatchDisplacement
 //                const label meshFacei = pp.addressing()[patchFacei];
 //                const label celli = mesh.faceOwner()[meshFacei];
 //                Map<labelList>::iterator faceFnd = cellToFaces.find(celli);
-//                if (faceFnd.found())
+//                if (faceFnd.good())
 //                {
 //                    labelList& faces = faceFnd();
 //                    faces.appendUniq(patchFacei);
@@ -2256,7 +2256,7 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
         forAll(f, fp)
         {
             const auto fnd = meshPointMap.cfind(f[fp]);
-            if (fnd.found())
+            if (fnd.good())
             {
                 const label patchPointi = fnd.val();
 
@@ -2973,7 +2973,7 @@ Foam::List<Foam::labelPair> Foam::snappyLayerDriver::getBafflesOnAddedMesh
         label oldFacei = newToOldFaces[facei];
 
         const auto faceFnd = baffleSet.find(oldFacei);
-        if (faceFnd.found())
+        if (faceFnd.good())
         {
             label bafflei = faceFnd();
             labelPair& p = newBaffles[bafflei];
@@ -4454,7 +4454,7 @@ void Foam::snappyLayerDriver::mapFaceZonePoints
         {
             const label oldFacei = map.faceMap()[facei];
             const auto iter = oldFaceToBaffle.find(oldFacei);
-            if (oldFacei != -1 && iter.found())
+            if (oldFacei != -1 && iter.good())
             {
                 const label bafflei = iter();
                 auto& newBaffle = newBaffles[bafflei];
@@ -4588,7 +4588,7 @@ void Foam::snappyLayerDriver::updatePatch
             const label oldMeshPointi =
                 map.pointMap()[newMeshPointi];
             const auto iter = baseMap.find(oldMeshPointi);
-            if (iter.found())
+            if (iter.good())
             {
                 newToOldPatchPoints[newPointi] = iter();
             }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 5defc3fb3e..9667c05783 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -798,7 +798,7 @@ void Foam::snappySnapDriver::freezeExposedPoints
     for (const label pointi : isFrozenPoint)
     {
         const auto iter = outside.meshPointMap().find(pointi);
-        if (iter.found())
+        if (iter.good())
         {
             outsideDisp[iter.val()] = Zero;
         }
@@ -1017,7 +1017,7 @@ void Foam::snappySnapDriver::getZoneSurfacePoints
 
             const auto iter = pp.meshPointMap().cfind(meshPointi);
 
-            if (iter.found())
+            if (iter.good())
             {
                 const label pointi = iter.val();
                 pointOnZone[pointi] = true;
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
index cb1a460bb7..c296ea7279 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
@@ -52,7 +52,7 @@ Foam::labelList Foam::snappySnapDriver::getFacePoints
 
             const auto iter = pp.meshPointMap().cfind(meshPointi);
 
-            if (iter.found())
+            if (iter.good())
             {
                 const label pointi = iter.val();
                 pointOnZone[pointi] = true;
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
index b1bbe31be5..cf2592485b 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
@@ -85,7 +85,7 @@ Foam::cyclicACMIGAMGInterface::cyclicACMIGAMGInterface
         {
             const auto iter = masterToCoarseFace.cfind(curMaster);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Already have coarse face
                 dynFaceRestrictAddressing.append(iter.val());
@@ -127,7 +127,7 @@ Foam::cyclicACMIGAMGInterface::cyclicACMIGAMGInterface
             {
                 const auto iter = masterToCoarseFace.cfind(curMaster);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     // Already have coarse face
                     dynNbrFaceRestrictAddressing.append(iter.val());
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
index 54194af015..13c893c3cb 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
@@ -85,7 +85,7 @@ Foam::cyclicAMIGAMGInterface::cyclicAMIGAMGInterface
         {
             const auto iter = masterToCoarseFace.cfind(curMaster);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Already have coarse face
                 dynFaceRestrictAddressing.append(iter.val());
@@ -127,7 +127,7 @@ Foam::cyclicAMIGAMGInterface::cyclicAMIGAMGInterface
             {
                 const auto iter = masterToCoarseFace.cfind(curMaster);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     // Already have coarse face
                     dynNbrFaceRestrictAddressing.append(iter.val());
diff --git a/src/meshTools/meshStructure/meshStructure.C b/src/meshTools/meshStructure/meshStructure.C
index b3db56c4d5..1e26ca5308 100644
--- a/src/meshTools/meshStructure/meshStructure.C
+++ b/src/meshTools/meshStructure/meshStructure.C
@@ -338,7 +338,7 @@ void Foam::meshStructure::correct
                             )
                         );
 
-                        if (fnd.found())
+                        if (fnd.good())
                         {
                             faceToPatchEdgeAddressing_[facei] = fnd.val();
                             faceToPatchFaceAddressing_[facei] = 0;
diff --git a/src/meshTools/multiWorld/multiWorldConnectionsObject.C b/src/meshTools/multiWorld/multiWorldConnectionsObject.C
index 3f0bcf293c..43e736228b 100644
--- a/src/meshTools/multiWorld/multiWorldConnectionsObject.C
+++ b/src/meshTools/multiWorld/multiWorldConnectionsObject.C
@@ -280,7 +280,7 @@ void Foam::multiWorldConnections::createComms()
             // - create a communicator and cache its value
 
             auto iter = table_.find(connect);
-            if (iter.found() && iter.val() == -1)
+            if (iter.good() && iter.val() == -1)
             {
                 iter.val() = createCommunicator(connect);
             }
@@ -353,7 +353,7 @@ Foam::label Foam::multiWorldConnections::getCommById
 
     const auto iter = table_.cfind(worlds);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalErrorInFunction
             << "No connection registered for worlds " << worlds
@@ -394,7 +394,7 @@ Foam::label Foam::multiWorldConnections::getCommByName
 
     const auto iter = table_.cfind(worlds);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalErrorInFunction
             << "No connection registered for worlds " << worlds
diff --git a/src/meshTools/regionSplit/localPointRegion.C b/src/meshTools/regionSplit/localPointRegion.C
index 7d6c0fb292..36e8eaadce 100644
--- a/src/meshTools/regionSplit/localPointRegion.C
+++ b/src/meshTools/regionSplit/localPointRegion.C
@@ -160,7 +160,7 @@ void Foam::localPointRegion::countPointRegions
                     {
                         // Multiple regions for this point. Add.
                         const auto iter = meshPointMap_.cfind(pointi);
-                        if (iter.found())
+                        if (iter.good())
                         {
                             labelList& regions = pointRegions[iter.val()];
                             if (!regions.found(region))
@@ -372,7 +372,7 @@ void Foam::localPointRegion::calcPointRegions
                         const label pointi = f[fp];
                         auto iter = minPointValue.find(pointi);
 
-                        if (!iter.found())
+                        if (!iter.good())
                         {
                             minPointValue.insert(pointi, minRegion[facei][fp]);
                         }
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index 8f31dd33f2..20ca5ece34 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -633,7 +633,7 @@ Foam::regionSplit::reduceRegionsImpl
                             // Record the minimum value seen
 
                             auto fnd = updateLookup.find(sent);
-                            if (!fnd.found())
+                            if (!fnd.good())
                             {
                                 updateLookup.insert(sent, recv);
                             }
diff --git a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
index f3b223ac09..ca7329dbec 100644
--- a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
@@ -79,7 +79,7 @@ Foam::label Foam::surfaceToCell::getNearest
 {
     const auto iter = cache.cfind(pointi);
 
-    if (iter.found())
+    if (iter.good())
     {
         return *iter;  // Return cached value
     }
diff --git a/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C b/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
index cdeb753361..45f028653f 100644
--- a/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
+++ b/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
@@ -1282,7 +1282,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::holeToFace::calcClosure
         const edge meshE = edge(mp[e[0]], mp[e[1]]);
 
         auto iter = edgeMap.cfind(meshE);
-        if (iter.found())
+        if (iter.good())
         {
             // Found edge on patch connected to blocked face. Seed with the
             // (global) index of that blocked face
diff --git a/src/meshTools/topoSet/topoSets/faceZoneSet.C b/src/meshTools/topoSet/topoSets/faceZoneSet.C
index d44b4f3695..557cbae831 100644
--- a/src/meshTools/topoSet/topoSets/faceZoneSet.C
+++ b/src/meshTools/topoSet/topoSets/faceZoneSet.C
@@ -183,7 +183,7 @@ void Foam::faceZoneSet::subset(const topoSet& set)
 
         const auto iter = faceToIndex.cfind(facei);
 
-        if (iter.found())
+        if (iter.good())
         {
             const label index = *iter;
 
@@ -231,7 +231,7 @@ void Foam::faceZoneSet::addSet(const topoSet& set)
 
         const auto iter = faceToIndex.cfind(facei);
 
-        if (iter.found())
+        if (iter.good())
         {
             const label index = *iter;
 
@@ -282,7 +282,7 @@ void Foam::faceZoneSet::subtractSet(const topoSet& set)
 
         const auto iter = faceToIndex.cfind(facei);
 
-        if (iter.found())
+        if (iter.good())
         {
             const label index = *iter;
 
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 022ed5cf24..bf7069fd35 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -804,7 +804,7 @@ Foam::surfaceFeatures::surfaceFeatures
     {
         const auto iter = dynFeatEdges.cfind(surfEdges[eI]);
 
-        if (iter.found())
+        if (iter.good())
         {
             allEdgeStat[eI] = edgeStat[iter.val()];
         }
diff --git a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
index fe16d4e97c..fbec058fd8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
+++ b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
@@ -98,7 +98,7 @@ createZeroBoundaryPtr
     {
         auto patchTypeCstrIter =
             fvPatchField<Type>::patchConstructorTablePtr_->cfind(bm[pI].type());
-        if (patchTypeCstrIter.found())
+        if (patchTypeCstrIter.good())
         {
             actualPatchTypes[pI] = bm[pI].type();
         }
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterface.C b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterface.C
index e252801633..2399f56912 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterface.C
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterface.C
@@ -114,7 +114,7 @@ Foam::calculatedProcessorGAMGInterface::calculatedProcessorGAMGInterface
 
         const auto fnd = cellsToCoarseFace.cfind(cellPair);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // Already have coarse face
             dynFaceRestrictAddressing.append(fnd.val());
diff --git a/src/overset/oversetCoupledPolyPatch/oversetGAMGInterface/oversetGAMGInterface.C b/src/overset/oversetCoupledPolyPatch/oversetGAMGInterface/oversetGAMGInterface.C
index 25cca9cf96..d3f42ad5a3 100644
--- a/src/overset/oversetCoupledPolyPatch/oversetGAMGInterface/oversetGAMGInterface.C
+++ b/src/overset/oversetCoupledPolyPatch/oversetGAMGInterface/oversetGAMGInterface.C
@@ -88,7 +88,7 @@ Foam::oversetGAMGInterface::oversetGAMGInterface
         {
             const auto iter = masterToCoarseFace.cfind(curMaster);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Already have coarse face
                 dynFaceRestrictAddressing.append(iter.val());
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index a3f6db6029..d81f9cba21 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -1369,7 +1369,7 @@ void Foam::distributedTriSurfaceMesh::surfaceSide
                     for (const edge& e : edges)
                     {
                         auto iter = edgeToFaces.find(e);
-                        if (iter.found())
+                        if (iter.good())
                         {
                             if (iter().second() == -1)
                             {
diff --git a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
index 2ea4e4df1d..5e88cac729 100644
--- a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
+++ b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
@@ -335,7 +335,7 @@ void Foam::faMeshReconstructor::calcAddressing
 
             const auto fnd = globalEdgeMapping.cfind(globalEdge);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 faEdgeProcAddr_[edgei] = fnd.val();
             }
@@ -409,7 +409,7 @@ void Foam::faMeshReconstructor::calcAddressing
                 const label globalEdgei = faEdgeProcAddr_[patchEdgei];
 
                 const auto fnd = remapGlobal.cfind(globalEdgei);
-                if (fnd.found())
+                if (fnd.good())
                 {
                     newEdgeProcAddr[edgei] = fnd.val();
                     ++edgei;
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
index 7d17da77eb..6943f0d90a 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
@@ -92,7 +92,7 @@ void Foam::multiphaseSystem::solveAlphas()
 
             const auto cAlpha = cAlphas_.cfind(interfacePair(phase, phase2));
 
-            if (cAlpha.found())
+            if (cAlpha.good())
             {
                 surfaceScalarField phic
                 (
@@ -279,7 +279,7 @@ void Foam::multiphaseSystem::correctContactAngle
             const auto tp =
                 acap.thetaProps().cfind(interfacePair(phase1, phase2));
 
-            if (!tp.found())
+            if (!tp.good())
             {
                 FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(phase1, phase2)
@@ -560,7 +560,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
 
         auto iterCvm = Cvms_.cfind(interfacePair(phase, phase2));
 
-        if (iterCvm.found())
+        if (iterCvm.good())
         {
             tCvm.ref() += iterCvm()*phase2.rho()*phase2;
         }
@@ -568,7 +568,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
         {
             iterCvm = Cvms_.cfind(interfacePair(phase2, phase));
 
-            if (iterCvm.found())
+            if (iterCvm.good())
             {
                 tCvm.ref() += iterCvm()*phase.rho()*phase2;
             }
@@ -613,7 +613,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
 
         auto Cvm = Cvms_.cfind(interfacePair(phase, phase2));
 
-        if (Cvm.found())
+        if (Cvm.good())
         {
             tSvm.ref() += Cvm()*phase2.rho()*phase2*phase2.DDtU();
         }
@@ -621,7 +621,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
         {
             Cvm = Cvms_.cfind(interfacePair(phase2, phase));
 
-            if (Cvm.found())
+            if (Cvm.good())
             {
                 tSvm.ref() += Cvm()*phase.rho()*phase2*phase2.DDtU();
             }
@@ -786,7 +786,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
 
         const auto sigma = sigmas_.cfind(interfacePair(phase1, phase2));
 
-        if (sigma.found())
+        if (sigma.good())
         {
             tSurfaceTension.ref() +=
                 dimensionedScalar("sigma", dimSigma_, *sigma)
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
index d50e7e4ed9..ecffddb653 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::nucleateFluxModel::New
 
     auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-    if (!cstrIter.found())
+    if (!cstrIter.good())
     {
         FatalIOErrorInLookup
         (
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index 27c998e006..a07a5ea347 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -610,7 +610,7 @@ void Foam::meshToMesh::distributeAndMergeCells
 
                 const auto fnd = procFaceToGlobalCell.cfind(key);
 
-                if (!fnd.found())
+                if (!fnd.good())
                 {
                     procFaceToGlobalCell.insert(key, -1);
                 }
@@ -725,7 +725,7 @@ void Foam::meshToMesh::distributeAndMergeCells
 
                 auto fnd = procFaceToGlobalCell.find(key);
 
-                if (fnd.found())
+                if (fnd.good())
                 {
                     label tgtFacei = fnd();
                     if (tgtFacei == -1)
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index bf2e91f9e6..071e6cd303 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -295,7 +295,7 @@ Foam::label Foam::probes::prepare(unsigned request)
         {                                                                     \
             Target.clear();  /* Remove old values */                          \
             const auto iter = selected.cfind(InputType::typeName);            \
-            if (iter.found())                                                 \
+            if (iter.good())                                                  \
             {                                                                 \
                 /* Add new (current) values */                                \
                 Target.append(iter.val().sortedToc());                        \
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 8f4603abe9..b1e31b816b 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -234,7 +234,7 @@ Foam::IOobjectList Foam::sampledSets::preCheckFields(unsigned request)
         #define doLocalCode(InputType)                                        \
         {                                                                     \
             const auto iter = selected.find(InputType::typeName);             \
-            if (iter.found())                                                 \
+            if (iter.good())                                                  \
             {                                                                 \
                 selectedFieldNames_.append(iter.val().sortedToc());           \
             }                                                                 \
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 225cc3752a..ed50dd69ef 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -236,7 +236,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
             // Convert groupId into zoneId
             const auto iterZone = zoneLookup.cfind(groupId);
-            if (iterZone.found())
+            if (iterZone.good())
             {
                 if (zoneId != *iterZone)
                 {
@@ -270,7 +270,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
             // Convert groupId into zoneId
             const auto iterZone = zoneLookup.cfind(groupId);
-            if (iterZone.found())
+            if (iterZone.good())
             {
                 if (zoneId != *iterZone)
                 {
@@ -411,7 +411,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
         const label zoneId  = iter.val();
 
         const auto iterName = nameLookup.cfind(groupId);
-        if (iterName.found())
+        if (iterName.good())
         {
             names[zoneId] = *iterName;
         }
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index 6f5c969394..d471bd66ae 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -124,7 +124,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
             const word groupName = word::validate(tokens[1]);
             const auto iterGroup = groupLookup.cfind(groupName);
 
-            if (iterGroup.found())
+            if (iterGroup.good())
             {
                 if (zoneId != *iterGroup)
                 {
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index fc91e99c3d..9c0ae4d633 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -178,7 +178,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
         {
             // Convert cellTableId to zoneId
             const auto iterGroup = lookup.cfind(cellTableId);
-            if (iterGroup.found())
+            if (iterGroup.good())
             {
                 if (zoneId != *iterGroup)
                 {
@@ -194,7 +194,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
 
                 const auto iterTableName = cellTableLookup.cfind(cellTableId);
 
-                if (iterTableName.found())
+                if (iterTableName.good())
                 {
                     dynNames.append(*iterTableName);
                 }
diff --git a/src/surfMesh/surfaceFormats/tri/TRIReader.C b/src/surfMesh/surfaceFormats/tri/TRIReader.C
index d1e42d6e1c..aa764f6ff3 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIReader.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIReader.C
@@ -111,7 +111,7 @@ bool Foam::fileFormats::TRIReader::readFile(const fileName& filename)
         const word name("zone" + rawName.substr(1));
 
         const auto iter = lookup.cfind(name);
-        if (iter.found())
+        if (iter.good())
         {
             if (zoneI != iter.val())
             {
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
index 084e626996..ca69a45607 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
@@ -45,7 +45,7 @@ Foam::basicThermo::getThermoOrDie
     auto ctorIter = thermoTable.cfind(thermoTypeName);
 
     // Print error message if package not found in the table
-    if (!ctorIter.found())
+    if (!ctorIter.good())
     {
         FatalIOErrorInLookup
         (
@@ -109,7 +109,7 @@ Foam::basicThermo::getThermoOrDie
 
         auto ctorIter = thermoTable.cfind(thermoTypeName);
 
-        if (!ctorIter.found())
+        if (!ctorIter.good())
         {
             FatalIOErrorInLookup
             (
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index cf3ef8f3f3..4c01e3ea67 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -653,7 +653,7 @@ bool finishReaction = false;
         const auto reactionKeywordIter =
             reactionKeywordTable_.cfind(keyword);
 
-        if (reactionKeywordIter.found())
+        if (reactionKeywordIter.good())
         {
             switch (reactionKeywordIter.val())
             {
@@ -763,7 +763,7 @@ bool finishReaction = false;
             const auto specieIndexIter =
                 specieIndices_.cfind(currentSpecieName);
 
-            if (specieIndexIter.found())
+            if (specieIndexIter.good())
             {
                 if (finishReaction)
                 {
@@ -807,7 +807,7 @@ bool finishReaction = false;
         const auto reactionKeywordIter =
             reactionKeywordTable_.cfind(keyword);
 
-        if (reactionKeywordIter.found())
+        if (reactionKeywordIter.good())
         {
             switch (reactionKeywordIter.val())
             {
@@ -1118,7 +1118,7 @@ bool finishReaction = false;
             const auto specieIndexIter =
                 specieIndices_.cfind(keyword);
 
-            if (specieIndexIter.found())
+            if (specieIndexIter.good())
             {
                 currentThirdBodyIndex = specieIndexIter.val();
             }
@@ -1142,7 +1142,7 @@ bool finishReaction = false;
         const auto specieIndexIter =
             specieIndices_.cfind(currentSpecieName);
 
-        if (specieIndexIter.found())
+        if (specieIndexIter.good())
         {
             if (finishReaction)
             {
@@ -1309,7 +1309,7 @@ bool finishReaction = false;
             const auto specieIndexIter =
                 specieIndices_.cfind(pDependentSpecieName);
 
-            if (specieIndexIter.found())
+            if (specieIndexIter.good())
             {
                 thirdBodyEfficiencies = 0.0;
                 thirdBodyEfficiencies[specieIndexIter.val()] = 1.0;
@@ -1352,7 +1352,7 @@ bool finishReaction = false;
 
         const auto specieIndexIter = specieIndices_.cfind(currentSpecieName);
 
-        if (specieIndexIter.found())
+        if (specieIndexIter.good())
         {
             currentSpecieIndex = specieIndexIter.val();
         }