diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index 979ce9ac5d..95b800de93 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -64,7 +64,7 @@ public:
     using List<string>::List;
 };
 
-} // end namespace Foam
+} // End namespace Foam
 
 
 using namespace Foam;
diff --git a/applications/test/contiguous/Test-contiguous.C b/applications/test/contiguous/Test-contiguous.C
index cfd324a22f..2de7836bd3 100644
--- a/applications/test/contiguous/Test-contiguous.C
+++ b/applications/test/contiguous/Test-contiguous.C
@@ -50,7 +50,7 @@ namespace Foam
 // Wrong, but interesting to test
 // template<> struct contiguous<Pair<word>> : std::true_type {};
 
-} // end namespace Foam
+} // End namespace Foam
 
 using namespace Foam;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H
index b768f5180a..c943cdb1fd 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H
@@ -80,8 +80,8 @@ bool writeCloudField
 );
 
 
-} // namespace ensightCloud
-} // namespace Foam
+} // End namespace ensightCloud
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H
index ff7608be5c..16efb842c1 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H
@@ -72,8 +72,8 @@ bool writeCloudField
 );
 
 
-} // namespace ensightSerialCloud
-} // namespace Foam
+} // End namespace ensightSerialCloud
+} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OSspecific/POSIX/clockValue/clockValue.C b/src/OSspecific/POSIX/clockValue/clockValue.C
index 21dc73e2fd..7394feaf55 100644
--- a/src/OSspecific/POSIX/clockValue/clockValue.C
+++ b/src/OSspecific/POSIX/clockValue/clockValue.C
@@ -35,7 +35,7 @@ namespace
     constexpr int factorMicro = (1000000);
     constexpr int factorMicro2 = (500000);
 
-} // end of anonymous
+} // End anonymous namespace
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
index fba8ed0071..fe40c6dbea 100644
--- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
@@ -76,7 +76,7 @@ addstopAtWriteNowSignalToOpt addstopAtWriteNowSignalToOpt_
     "stopAtWriteNowSignal"
 );
 
-} // end of namespace Foam
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.C b/src/OSspecific/POSIX/signals/sigWriteNow.C
index 812d89f863..fcc1c15f1b 100644
--- a/src/OSspecific/POSIX/signals/sigWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigWriteNow.C
@@ -74,7 +74,7 @@ public:
 
 addwriteNowSignalToOpt addwriteNowSignalToOpt_("writeNowSignal");
 
-} // end of namespace Foam
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
index d3a60388e2..c6faae7f2c 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
@@ -85,7 +85,7 @@ protected:
 
 };
 
-} // end namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
index adb4bf77e2..dccea8ccd5 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
@@ -87,7 +87,7 @@ protected:
 
 };
 
-} // end namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H
index 08ae90e8e7..5e091bb5b9 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H
@@ -99,7 +99,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
index 50899066b3..96044458e1 100644
--- a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
+++ b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
@@ -170,7 +170,7 @@ public:
 
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/IOstreams/memory/IListStream.H b/src/OpenFOAM/db/IOstreams/memory/IListStream.H
index c6c5300cc4..7170dc4300 100644
--- a/src/OpenFOAM/db/IOstreams/memory/IListStream.H
+++ b/src/OpenFOAM/db/IOstreams/memory/IListStream.H
@@ -121,7 +121,7 @@ public:
         }
 };
 
-} // end namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/IOstreams/memory/OCountStream.H b/src/OpenFOAM/db/IOstreams/memory/OCountStream.H
index a7f0aae83f..3d4f4367dd 100644
--- a/src/OpenFOAM/db/IOstreams/memory/OCountStream.H
+++ b/src/OpenFOAM/db/IOstreams/memory/OCountStream.H
@@ -192,7 +192,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/IOstreams/memory/OListStream.H b/src/OpenFOAM/db/IOstreams/memory/OListStream.H
index 249413ff5c..e95b0a91f0 100644
--- a/src/OpenFOAM/db/IOstreams/memory/OListStream.H
+++ b/src/OpenFOAM/db/IOstreams/memory/OListStream.H
@@ -361,7 +361,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/IOstreams/memory/UIListStream.H b/src/OpenFOAM/db/IOstreams/memory/UIListStream.H
index 4e6df766b7..b397c47333 100644
--- a/src/OpenFOAM/db/IOstreams/memory/UIListStream.H
+++ b/src/OpenFOAM/db/IOstreams/memory/UIListStream.H
@@ -191,7 +191,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/IOstreams/memory/UOListStream.H b/src/OpenFOAM/db/IOstreams/memory/UOListStream.H
index 3e58c94fd3..461549891e 100644
--- a/src/OpenFOAM/db/IOstreams/memory/UOListStream.H
+++ b/src/OpenFOAM/db/IOstreams/memory/UOListStream.H
@@ -164,7 +164,7 @@ public:
         }
 };
 
-} // end of namespace Detail
+} // End namespace Detail
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
index eb0342e1ce..efebf3170c 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
@@ -44,7 +44,7 @@ namespace
             << "    " << msg << std::endl;
     }
 
-} // end of anonymous namespace
+} // End anonymous namespace
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H
index fcc57c98fc..4c33c67b05 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H
@@ -43,7 +43,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 
 class objectMap;
 inline bool operator==(const objectMap& a, const objectMap& b);
@@ -53,7 +53,7 @@ inline Istream& operator>>(Istream&, objectMap&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class objectMap Declaration
+                          Class objectMap Declaration
 \*---------------------------------------------------------------------------*/
 
 class objectMap
@@ -71,14 +71,14 @@ public:
 
     // Constructors
 
-        //- Null constructor for lists
+        //- Null constructor, with index=-1 and no objects
         inline objectMap();
 
         //- Construct from components
-        inline objectMap(const label index, const labelList& master);
+        inline objectMap(const label index, const UList<label>& master);
 
         //- Construct from Istream
-        inline objectMap(Istream&);
+        inline objectMap(Istream& is);
 
 
     // Member Functions
@@ -101,7 +101,6 @@ public:
     // IOstream Operators
 
         friend Ostream& operator<<(Ostream&, const objectMap&);
-
         friend Istream& operator>>(Istream&, objectMap&);
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H
index 1563a11fcc..d77f38d674 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H
@@ -21,68 +21,58 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline objectMap::objectMap()
+inline Foam::objectMap::objectMap()
 :
     index_(-1),
-    masterObjects_(0)
+    masterObjects_()
 {}
 
 
-inline objectMap::objectMap(const label index, const labelList& master)
+inline Foam::objectMap::objectMap(const label index, const UList<label>& master)
 :
     index_(index),
     masterObjects_(master)
 {}
 
 
-inline objectMap::objectMap(Istream& is)
+inline Foam::objectMap::objectMap(Istream& is)
 {
-    // Read beginning of objectMap
     is.readBegin("objectMap");
 
     is >> index_ >> static_cast<labelList&>(masterObjects_);
 
-    // Read master of objectMap
     is.readEnd("objectMap");
-
     is.check(FUNCTION_NAME);
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-label& objectMap::index()
+Foam::label& Foam::objectMap::index()
 {
     return index_;
 }
 
 
-inline label objectMap::index() const
+inline Foam::label Foam::objectMap::index() const
 {
     return index_;
 }
 
 
-inline labelList& objectMap::masterObjects()
+inline Foam::labelList& Foam::objectMap::masterObjects()
 {
     return masterObjects_;
 }
 
 
-inline const labelList& objectMap::masterObjects() const
+inline const Foam::labelList& Foam::objectMap::masterObjects() const
 {
     return masterObjects_;
 }
@@ -90,7 +80,7 @@ inline const labelList& objectMap::masterObjects() const
 
 // * * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * //
 
-inline bool operator==(const objectMap& a, const objectMap& b)
+inline bool Foam::operator==(const objectMap& a, const objectMap& b)
 {
     return
     (
@@ -99,15 +89,15 @@ inline bool operator==(const objectMap& a, const objectMap& b)
 }
 
 
-inline bool operator!=(const objectMap& a, const objectMap& b)
+inline bool Foam::operator!=(const objectMap& a, const objectMap& b)
 {
-    return (!(a == b));
+    return !(a == b);
 }
 
 
 // * * * * * * * * * * * * * * * Ostream Operator *  * * * * * * * * * * * * //
 
-inline Ostream& operator<<(Ostream& os, const objectMap& a)
+inline Foam::Ostream& Foam::operator<<(Ostream& os, const objectMap& a)
 {
     os  << token::BEGIN_LIST
         << a.index_ << token::SPACE
@@ -119,10 +109,10 @@ inline Ostream& operator<<(Ostream& os, const objectMap& a)
 }
 
 
-inline Istream& operator>>(Istream& is, objectMap& a)
+inline Foam::Istream& Foam::operator>>(Istream& is, objectMap& a)
 {
     is.readBegin("objectMap");
-    is  >> a.index_ >> a.masterObjects_;
+    is >> a.index_ >> a.masterObjects_;
     is.readEnd("objectMap");
 
     is.check(FUNCTION_NAME);
@@ -130,8 +120,4 @@ inline Istream& operator>>(Istream& is, objectMap& a)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // Master namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index 51d095d1e1..484ef5f9f5 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -165,7 +165,7 @@ static void expandLeading(std::string& s)
     }
 }
 
-} // end of namespace Foam
+} // End namespace Foam
 
 
 //! \cond fileScope
diff --git a/src/conversion/ccm/reader/ccmReader.H b/src/conversion/ccm/reader/ccmReader.H
index d19952298b..d7790ededa 100644
--- a/src/conversion/ccm/reader/ccmReader.H
+++ b/src/conversion/ccm/reader/ccmReader.H
@@ -186,7 +186,8 @@ class reader
     protected fileFormats::STARCDCore
 {
 public:
-    // Forward Declarations
+
+    // Forward declarations
     class options;
 
 
diff --git a/src/fileFormats/stl/STLAsciiParseManual.C b/src/fileFormats/stl/STLAsciiParseManual.C
index 1b7beebb7e..28c507fc29 100644
--- a/src/fileFormats/stl/STLAsciiParseManual.C
+++ b/src/fileFormats/stl/STLAsciiParseManual.C
@@ -135,8 +135,8 @@ public:
     void execute(std::istream& is);
 };
 
-} // end of namespace Detail
-} // end of namespace Foam
+} // End namespace Detail
+} // End namespace Foam
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/src/fileFormats/stl/STLAsciiParseRagel.C b/src/fileFormats/stl/STLAsciiParseRagel.C
index 9c3cd3ce93..2dc7a427ae 100644
--- a/src/fileFormats/stl/STLAsciiParseRagel.C
+++ b/src/fileFormats/stl/STLAsciiParseRagel.C
@@ -126,8 +126,8 @@ public:
     void execute(std::istream& is);
 };
 
-} // end of namespace Detail
-} // end of namespace Foam
+} // End namespace Detail
+} // End namespace Foam
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/src/fileFormats/stl/STLAsciiParseRagel.rl b/src/fileFormats/stl/STLAsciiParseRagel.rl
index 21ec26528a..a1cb3a4cf7 100644
--- a/src/fileFormats/stl/STLAsciiParseRagel.rl
+++ b/src/fileFormats/stl/STLAsciiParseRagel.rl
@@ -181,8 +181,8 @@ public:
     void execute(std::istream& is);
 };
 
-} // end of namespace Detail
-} // end of namespace Foam
+} // End namespace Detail
+} // End namespace Foam
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/src/fileFormats/stl/STLReader.H b/src/fileFormats/stl/STLReader.H
index 00693262f9..f2ec858b7c 100644
--- a/src/fileFormats/stl/STLReader.H
+++ b/src/fileFormats/stl/STLReader.H
@@ -49,10 +49,11 @@ namespace Foam
 namespace Detail
 {
 
-// Forward Declarations
+// Forward declarations
 class STLAsciiParse;
 
-}
+} // End namespace Detail
+
 
 namespace fileFormats
 {
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 7e702381dc..9aa3e0b972 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -46,8 +46,8 @@ namespace functionObjects
         externalCoupled,
         dictionary
     );
-}
-}
+} // End namespace functionObject
+} // End namespace Foam
 
 Foam::string Foam::functionObjects::externalCoupled::patchKey = "// Patch:";
 
@@ -78,8 +78,7 @@ static void writeList(Ostream& os, const string& header, const UList<T>& L)
 }
 //! \endcond
 
-}
-// namespace Foam
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
index 8b1d837dee..29b1107055 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
@@ -128,7 +128,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace Foam
+} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index a1df8e61b4..4e74f34a2f 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -78,8 +78,7 @@ static void writeList(Ostream& os, const string& header, const UList<T>& lst)
 }
 //! \endcond
 
-}
-// namespace Foam
+} // End namespace Foam
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
diff --git a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H
index 72cbeeab7a..55b7ae98a0 100644
--- a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H
+++ b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H
@@ -108,7 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
index caf5ea259d..1521bd0a01 100644
--- a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
+++ b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
@@ -118,7 +118,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/blockMesh/blockEdges/bezier/bezier.H b/src/mesh/blockMesh/blockEdges/bezier/bezier.H
index 1ea280b921..92c718e804 100644
--- a/src/mesh/blockMesh/blockEdges/bezier/bezier.H
+++ b/src/mesh/blockMesh/blockEdges/bezier/bezier.H
@@ -121,7 +121,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/blockMesh/blockEdges/lineEdge/lineEdge.H b/src/mesh/blockMesh/blockEdges/lineEdge/lineEdge.H
index c5266b28c3..0ab930b0a4 100644
--- a/src/mesh/blockMesh/blockEdges/lineEdge/lineEdge.H
+++ b/src/mesh/blockMesh/blockEdges/lineEdge/lineEdge.H
@@ -93,7 +93,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H
index 62e42ca31c..cb1165a746 100644
--- a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H
+++ b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H
@@ -108,7 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H b/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H
index e1457a2d87..3396166ca7 100644
--- a/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H
+++ b/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H
@@ -108,7 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End of namespace blockEdges
+} // End namespace blockEdges
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C
index 0cf7a0956a..75e30c051d 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C
@@ -73,8 +73,8 @@ void kinematicSingleLayer::constrainFilmField
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace Foam
-} // end namespace regionModels
-} // end namespace surfaceFilmModels
+} // End namespace Foam
+} // End namespace regionModels
+} // End namespace surfaceFilmModels
 
 // ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
index 533ca8549f..b663d65591 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
@@ -68,8 +68,8 @@ void filmViscosityModel::info(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace surfaceFilmModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
index fde0a1b2c7..0bf3d67e1e 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
@@ -65,8 +65,8 @@ autoPtr<filmViscosityModel> filmViscosityModel::New
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace surfaceFilmModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
index a7d643c974..81685b2a91 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
@@ -126,8 +126,8 @@ void phaseChangeModel::info(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace surfaceFilmModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
index eb2601a893..4a3de0129a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
@@ -64,8 +64,8 @@ autoPtr<phaseChangeModel> phaseChangeModel::New
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace surfaceFilmModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 80af16ed6e..91c1a6997a 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -864,8 +864,8 @@ tmp<volScalarField::Internal> thermoSingleLayer::Sh() const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace Foam
-} // end namespace regionModels
-} // end namespace surfaceFilmModels
+} // End namespace Foam
+} // End namespace regionModels
+} // End namespace surfaceFilmModels
 
 // ************************************************************************* //
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index fd18fe6ac9..9e75ffaeab 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -354,8 +354,8 @@ void thermalBaffle::info()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // end namespace thermalBaffleModels
-} // end namespace regionModels
-} // end namespace Foam
+} // End namespace thermalBaffleModels
+} // End namespace regionModels
+} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
index 4a9bb6cac1..b06a499413 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
@@ -125,8 +125,7 @@ namespace Foam
     }
 
 
-}  // end of namespace Foam
-
+}  // End namespace Foam
 
 
 // ************************************************************************* //
diff --git a/wmake/src/wmkdepend.cpp b/wmake/src/wmkdepend.cpp
index 251ce2d415..d60d1fd490 100644
--- a/wmake/src/wmkdepend.cpp
+++ b/wmake/src/wmkdepend.cpp
@@ -298,7 +298,7 @@ namespace Files
         return infile;
     }
 
-} // end of namespace Files
+} // End namespace Files
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/wmake/src/wmkdepend.rl b/wmake/src/wmkdepend.rl
index ee80952474..a811f51913 100644
--- a/wmake/src/wmkdepend.rl
+++ b/wmake/src/wmkdepend.rl
@@ -296,7 +296,7 @@ namespace Files
         return infile;
     }
 
-} // end of namespace Files
+} // End namespace Files
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */