From edafb229f6613926379f68ed3d859aa935ac0ea1 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sat, 23 Feb 2019 22:17:50 +0100
Subject: [PATCH] Fix namespace comments.

---
 Applications/ApplicationsLib/LinearSolverLibrarySetup.h     | 2 +-
 Applications/ApplicationsLib/LogogSetup.h                   | 2 +-
 Applications/DataHolderLib/Color.cpp                        | 2 +-
 Applications/DataHolderLib/Color.h                          | 2 +-
 Applications/DataHolderLib/ColorLookupTable.cpp             | 4 +---
 Applications/DataHolderLib/ColorLookupTable.h               | 2 +-
 Applications/DataHolderLib/Project.cpp                      | 2 +-
 Applications/DataHolderLib/Project.h                        | 2 +-
 Applications/FileIO/CsvInterface.h                          | 2 +-
 Applications/FileIO/GMSInterface.cpp                        | 2 +-
 Applications/FileIO/GMSInterface.h                          | 2 +-
 Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp        | 2 +-
 Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h          | 2 +-
 Applications/FileIO/Gmsh/GMSHFixedMeshDensity.cpp           | 2 +-
 Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h             | 2 +-
 Applications/FileIO/Legacy/OGSIOVer4.cpp                    | 2 +-
 Applications/FileIO/Legacy/OGSIOVer4.h                      | 2 +-
 Applications/FileIO/Legacy/createSurface.cpp                | 2 +-
 Applications/FileIO/Legacy/createSurface.h                  | 2 +-
 Applications/FileIO/SHPInterface.cpp                        | 2 +-
 Applications/FileIO/SHPInterface.h                          | 2 +-
 Applications/FileIO/TetGenInterface.h                       | 2 +-
 Applications/FileIO/readGeometryFromFile.cpp                | 2 +-
 Applications/FileIO/writeGeometryToFile.cpp                 | 2 +-
 BaseLib/BuildInfo.h                                         | 4 ++--
 BaseLib/ConfigTree-impl.h                                   | 2 +-
 BaseLib/ConfigTree.cpp                                      | 2 +-
 BaseLib/ConfigTree.h                                        | 2 +-
 BaseLib/ConfigTreeUtil.cpp                                  | 2 +-
 BaseLib/ConfigTreeUtil.h                                    | 2 +-
 BaseLib/Functional.cpp                                      | 2 +-
 BaseLib/IO/XmlIO/XMLInterface.cpp                           | 2 +-
 BaseLib/IO/XmlIO/XMLInterface.h                             | 4 ++--
 BaseLib/MemWatch.h                                          | 2 +-
 BaseLib/Subdivision.h                                       | 2 +-
 BaseLib/TimeInterval.cpp                                    | 2 +-
 BaseLib/TimeInterval.h                                      | 2 +-
 GeoLib/AABB.h                                               | 2 +-
 GeoLib/AnalyticalGeometry.cpp                               | 2 +-
 GeoLib/DuplicateGeometry.cpp                                | 2 +-
 GeoLib/DuplicateGeometry.h                                  | 2 +-
 GeoLib/GEOObjects.cpp                                       | 3 +--
 GeoLib/GEOObjects.h                                         | 2 +-
 GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp                 | 4 ++--
 GeoLib/IO/XmlIO/Rapid/RapidStnInterface.h                   | 4 ++--
 GeoLib/LineSegment.cpp                                      | 2 +-
 GeoLib/LineSegment.h                                        | 2 +-
 GeoLib/MinimalBoundingSphere.cpp                            | 2 +-
 GeoLib/MinimalBoundingSphere.h                              | 2 +-
 GeoLib/Point.h                                              | 2 +-
 GeoLib/PointVec.cpp                                         | 2 +-
 GeoLib/PointVec.h                                           | 2 +-
 GeoLib/PolygonWithSegmentMarker.cpp                         | 2 +-
 GeoLib/Polyline.h                                           | 2 +-
 GeoLib/PolylineVec.h                                        | 2 +-
 GeoLib/PolylineWithSegmentMarker.cpp                        | 2 +-
 GeoLib/PolylineWithSegmentMarker.h                          | 2 +-
 GeoLib/QuadTree.h                                           | 2 +-
 GeoLib/Raster.h                                             | 2 +-
 GeoLib/Station.cpp                                          | 3 +--
 GeoLib/Station.h                                            | 2 +-
 GeoLib/StationBorehole.cpp                                  | 2 +-
 GeoLib/StationBorehole.h                                    | 2 +-
 GeoLib/Surface.cpp                                          | 2 +-
 GeoLib/Surface.h                                            | 2 +-
 MaterialLib/Adsorption/Adsorption.cpp                       | 4 +---
 MaterialLib/Adsorption/Adsorption.h                         | 2 +-
 MaterialLib/Adsorption/Density100MPa.cpp                    | 4 ++--
 MaterialLib/Adsorption/Density100MPa.h                      | 2 +-
 MaterialLib/Adsorption/DensityConst.cpp                     | 4 ++--
 MaterialLib/Adsorption/DensityConst.h                       | 2 +-
 MaterialLib/Adsorption/DensityCook.cpp                      | 4 ++--
 MaterialLib/Adsorption/DensityCook.h                        | 2 +-
 MaterialLib/Adsorption/DensityDubinin.cpp                   | 4 ++--
 MaterialLib/Adsorption/DensityDubinin.h                     | 2 +-
 MaterialLib/Adsorption/DensityHauer.cpp                     | 4 ++--
 MaterialLib/Adsorption/DensityHauer.h                       | 2 +-
 MaterialLib/Adsorption/DensityLegacy.cpp                    | 4 ++--
 MaterialLib/Adsorption/DensityLegacy.h                      | 2 +-
 MaterialLib/Adsorption/DensityMette.cpp                     | 4 ++--
 MaterialLib/Adsorption/DensityMette.h                       | 2 +-
 MaterialLib/Adsorption/DensityNunez.cpp                     | 4 ++--
 MaterialLib/Adsorption/DensityNunez.h                       | 2 +-
 MaterialLib/Adsorption/Reaction.h                           | 2 +-
 MaterialLib/Adsorption/ReactionCaOH2.cpp                    | 2 +-
 MaterialLib/Adsorption/ReactionCaOH2.h                      | 2 +-
 MaterialLib/Adsorption/ReactionInert.h                      | 2 +-
 MaterialLib/Adsorption/ReactionSinusoidal.h                 | 2 +-
 MaterialLib/Fluid/ConstantFluidProperty.h                   | 4 ++--
 MaterialLib/Fluid/Density/CreateFluidDensityModel.cpp       | 4 ++--
 MaterialLib/Fluid/Density/IdealGasLaw.h                     | 4 ++--
 .../Fluid/Density/LinearConcentrationDependentDensity.h     | 4 ++--
 .../Fluid/Density/LinearTemperatureDependentDensity.h       | 4 ++--
 MaterialLib/Fluid/Density/LiquidDensity.h                   | 4 ++--
 MaterialLib/Fluid/Density/WaterDensityIAPWSIF97Region1.h    | 4 ++--
 MaterialLib/Fluid/FluidProperties/CreateFluidProperties.cpp | 4 ++--
 MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h   | 2 +-
 MaterialLib/Fluid/FluidProperties/FluidProperties.h         | 4 ++--
 .../FluidPropertiesWithDensityDependentModels.cpp           | 4 ++--
 .../FluidPropertiesWithDensityDependentModels.h             | 4 ++--
 .../PrimaryVariableDependentFluidProperties.h               | 4 ++--
 MaterialLib/Fluid/FluidProperty.h                           | 4 ++--
 .../GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.cpp | 4 ++--
 .../GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.h   | 4 ++--
 MaterialLib/Fluid/PropertyVariableType.h                    | 4 ++--
 .../CreateSpecificFluidHeatCapacityModel.cpp                | 4 ++--
 .../CreateSpecificFluidHeatCapacityModel.h                  | 4 ++--
 .../CreateFluidThermalConductivityModel.cpp                 | 4 ++--
 .../CreateFluidThermalConductivityModel.h                   | 4 ++--
 MaterialLib/Fluid/Viscosity/CreateViscosityModel.cpp        | 4 ++--
 MaterialLib/Fluid/Viscosity/CreateViscosityModel.h          | 2 +-
 .../Fluid/Viscosity/LinearPressureDependentViscosity.h      | 4 ++--
 MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h | 4 ++--
 MaterialLib/Fluid/Viscosity/VogelsLiquidDynamicViscosity.h  | 4 ++--
 MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp         | 4 ++--
 MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.h           | 4 ++--
 .../Fluid/WaterVaporProperties/WaterVaporProperties.cpp     | 4 ++--
 .../Fluid/WaterVaporProperties/WaterVaporProperties.h       | 4 ++--
 MaterialLib/FractureModels/MohrCoulomb.cpp                  | 2 +-
 MaterialLib/MPL/CreateComponent.cpp                         | 2 +-
 MaterialLib/MPL/CreatePhase.cpp                             | 2 +-
 MaterialLib/MPL/Properties/LinearProperty.h                 | 2 +-
 MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp    | 4 ++--
 MaterialLib/PorousMedium/Permeability/Permeability.h        | 4 ++--
 .../PorousMedium/Permeability/createPermeabilityModel.cpp   | 4 ++--
 .../PorousMedium/Permeability/createPermeabilityModel.h     | 4 ++--
 MaterialLib/PorousMedium/Porosity/Porosity.h                | 4 ++--
 MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp   | 4 ++--
 MaterialLib/PorousMedium/Porosity/createPorosityModel.h     | 4 ++--
 MaterialLib/PorousMedium/PorousMediaProperties.cpp          | 4 ++--
 MaterialLib/PorousMedium/PorousMediaProperties.h            | 4 ++--
 MaterialLib/PorousMedium/Storage/ConstantStorage.h          | 4 ++--
 MaterialLib/PorousMedium/Storage/Storage.h                  | 4 ++--
 MaterialLib/PorousMedium/Storage/createStorageModel.cpp     | 4 ++--
 MaterialLib/PorousMedium/Storage/createStorageModel.h       | 2 +-
 .../BrooksCoreyCapillaryPressureSaturation.cpp              | 4 ++--
 .../BrooksCoreyCapillaryPressureSaturation.h                | 4 ++--
 .../CapillaryPressure/CapillaryPressureSaturation.h         | 4 ++--
 .../CapillaryPressure/CapillaryPressureSaturationCurve.h    | 4 ++--
 .../CapillaryPressure/CreateCapillaryPressureModel.cpp      | 4 ++--
 .../CapillaryPressure/CreateCapillaryPressureModel.h        | 2 +-
 .../VanGenuchtenCapillaryPressureSaturation.cpp             | 4 ++--
 .../VanGenuchtenCapillaryPressureSaturation.h               | 4 ++--
 .../CreateRelativePermeabilityModel.cpp                     | 4 ++--
 .../RelativePermeability/CreateRelativePermeabilityModel.h  | 2 +-
 .../NonWettingPhaseBrooksCoreyOilGas.cpp                    | 4 ++--
 .../RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.h | 4 ++--
 .../RelativePermeability/NonWettingPhaseVanGenuchten.cpp    | 4 ++--
 .../RelativePermeability/NonWettingPhaseVanGenuchten.h      | 4 ++--
 .../RelativePermeability/RelativePermeability.h             | 4 ++--
 .../RelativePermeability/RelativePermeabilityCurve.h        | 4 ++--
 .../RelativePermeability/WettingPhaseBrooksCoreyOilGas.cpp  | 4 ++--
 .../RelativePermeability/WettingPhaseBrooksCoreyOilGas.h    | 4 ++--
 .../RelativePermeability/WettingPhaseVanGenuchten.cpp       | 4 ++--
 .../RelativePermeability/WettingPhaseVanGenuchten.h         | 4 ++--
 MaterialLib/SolidModels/CreateConstitutiveRelation.cpp      | 4 ++--
 MaterialLib/SolidModels/CreateConstitutiveRelation.h        | 4 ++--
 MaterialLib/SolidModels/CreateCreepBGRa.h                   | 6 +++---
 .../SolidModels/CreateNewtonRaphsonSolverParameters.cpp     | 2 +-
 MaterialLib/SolidModels/Lubby2.h                            | 2 +-
 .../TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp | 4 ++--
 .../TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h   | 2 +-
 .../TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp | 4 ++--
 .../TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h   | 4 ++--
 MathLib/Curve/CreatePiecewiseLinearCurve-impl.h             | 2 +-
 MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp             | 2 +-
 MathLib/Curve/PiecewiseLinearMonotonicCurve.h               | 2 +-
 MathLib/Integration/GaussLegendrePyramid.cpp                | 2 +-
 MathLib/Integration/GaussLegendrePyramid.h                  | 2 +-
 MathLib/Integration/GaussLegendreTet.cpp                    | 2 +-
 MathLib/Integration/GaussLegendreTet.h                      | 2 +-
 MathLib/Integration/GaussLegendreTri.cpp                    | 2 +-
 MathLib/Integration/GaussLegendreTri.h                      | 2 +-
 .../PiecewiseLinearInterpolation.cpp                        | 2 +-
 MathLib/LinAlg/Eigen/EigenLinearSolver.cpp                  | 4 ++--
 MathLib/LinAlg/Eigen/EigenLinearSolver.h                    | 2 +-
 MathLib/LinAlg/Eigen/EigenMapTools.h                        | 2 +-
 MathLib/LinAlg/Eigen/EigenOption.cpp                        | 2 +-
 MathLib/LinAlg/Eigen/EigenOption.h                          | 2 +-
 MathLib/LinAlg/Eigen/EigenTools.cpp                         | 5 +----
 MathLib/LinAlg/Eigen/EigenTools.h                           | 2 +-
 MathLib/LinAlg/Eigen/EigenVector.h                          | 2 +-
 MathLib/LinAlg/LinAlg.h                                     | 4 ++--
 MathLib/LinAlg/LinearSolverOptions.cpp                      | 2 +-
 MathLib/LinAlg/LinearSolverOptions.h                        | 2 +-
 MathLib/LinAlg/RowColumnIndices.h                           | 2 +-
 MathLib/LinAlg/SetMatrixSparsity.h                          | 2 +-
 MathLib/LinearFunction.h                                    | 2 +-
 MathLib/MathTools.cpp                                       | 4 +---
 MathLib/MathTools.h                                         | 2 +-
 MathLib/Nonlinear/Root1D.h                                  | 5 ++---
 MathLib/Point3dWithID.h                                     | 2 +-
 MathLib/Vector3.h                                           | 2 +-
 MeshGeoToolsLib/AppendLinesAlongPolyline.cpp                | 3 +--
 MeshGeoToolsLib/AppendLinesAlongPolyline.h                  | 2 +-
 MeshGeoToolsLib/BoundaryElementsAtPoint.cpp                 | 2 +-
 MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h      | 2 +-
 MeshLib/CoordinateSystem.cpp                                | 2 +-
 MeshLib/CoordinateSystem.h                                  | 2 +-
 MeshLib/ElementCoordinatesMappingLocal.cpp                  | 2 +-
 MeshLib/ElementCoordinatesMappingLocal.h                    | 2 +-
 MeshLib/ElementStatus.cpp                                   | 2 +-
 MeshLib/ElementStatus.h                                     | 2 +-
 MeshLib/Elements/CellRule.cpp                               | 2 +-
 MeshLib/Elements/CellRule.h                                 | 2 +-
 MeshLib/Elements/EdgeReturn.cpp                             | 3 +--
 MeshLib/Elements/EdgeReturn.h                               | 2 +-
 MeshLib/Elements/EdgeRule.h                                 | 2 +-
 MeshLib/Elements/Element.cpp                                | 2 +-
 MeshLib/Elements/Element.h                                  | 2 +-
 MeshLib/Elements/FaceRule.cpp                               | 3 +--
 MeshLib/Elements/FaceRule.h                                 | 2 +-
 MeshLib/Elements/HexRule20.h                                | 2 +-
 MeshLib/Elements/HexRule8.h                                 | 2 +-
 MeshLib/Elements/LineRule2.h                                | 2 +-
 MeshLib/Elements/LineRule3.h                                | 2 +-
 MeshLib/Elements/MapBulkElementPoint.cpp                    | 2 +-
 MeshLib/Elements/MapBulkElementPoint.h                      | 2 +-
 MeshLib/Elements/PointRule1.h                               | 2 +-
 MeshLib/Elements/PrismRule15.h                              | 2 +-
 MeshLib/Elements/PrismRule6.h                               | 2 +-
 MeshLib/Elements/PyramidRule13.h                            | 2 +-
 MeshLib/Elements/PyramidRule5.h                             | 2 +-
 MeshLib/Elements/QuadRule4.h                                | 2 +-
 MeshLib/Elements/QuadRule8.h                                | 2 +-
 MeshLib/Elements/QuadRule9.h                                | 2 +-
 MeshLib/Elements/TemplateElement-impl.h                     | 4 +---
 MeshLib/Elements/TemplateElement.h                          | 2 +-
 MeshLib/Elements/TetRule10.h                                | 2 +-
 MeshLib/Elements/TetRule4.h                                 | 2 +-
 MeshLib/Elements/TriRule3.h                                 | 2 +-
 MeshLib/Elements/TriRule6.h                                 | 2 +-
 MeshLib/Elements/VertexRule.h                               | 2 +-
 MeshLib/IO/Legacy/MeshIO.cpp                                | 2 +-
 MeshLib/IO/MPI_IO/PropertyVectorMetaData.h                  | 4 ++--
 MeshLib/IO/VtkIO/PVDFile.cpp                                | 4 ++--
 MeshLib/Mesh.cpp                                            | 2 +-
 MeshLib/Mesh.h                                              | 2 +-
 MeshLib/MeshEditing/FlipElements.h                          | 2 +-
 MeshLib/MeshEditing/MeshRevision.h                          | 2 +-
 MeshLib/MeshEditing/RemoveMeshComponents.cpp                | 2 +-
 MeshLib/MeshEnums.cpp                                       | 2 +-
 MeshLib/MeshEnums.h                                         | 2 +-
 MeshLib/MeshGenerators/MeshGenerator.cpp                    | 2 +-
 MeshLib/MeshGenerators/MeshGenerator.h                      | 4 ++--
 MeshLib/MeshInformation.cpp                                 | 2 +-
 MeshLib/MeshInformation.h                                   | 2 +-
 MeshLib/MeshQuality/AngleSkewMetric.h                       | 2 +-
 MeshLib/MeshQuality/EdgeRatioMetric.h                       | 2 +-
 MeshLib/MeshQuality/ElementQualityMetric.h                  | 2 +-
 MeshLib/MeshQuality/ElementSizeMetric.h                     | 2 +-
 MeshLib/MeshQuality/RadiusEdgeRatioMetric.h                 | 2 +-
 MeshLib/MeshQuality/SizeDifferenceMetric.h                  | 2 +-
 MeshLib/Node.cpp                                            | 3 +--
 MeshLib/Node.h                                              | 2 +-
 MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate-impl.h          | 2 +-
 MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h               | 2 +-
 MeshLib/convertMeshToGeo.cpp                                | 3 +--
 MeshLib/convertMeshToGeo.h                                  | 2 +-
 MeshLib/findElementsWithinRadius.cpp                        | 2 +-
 NumLib/DOF/ComputeSparsityPattern.cpp                       | 2 +-
 NumLib/DOF/ComputeSparsityPattern.h                         | 2 +-
 NumLib/DOF/GlobalMatrixProviders.h                          | 2 +-
 NumLib/DOF/LocalToGlobalIndexMap.cpp                        | 2 +-
 NumLib/DOF/SimpleMatrixVectorProvider.cpp                   | 5 ++---
 NumLib/Distribution/Distribution.cpp                        | 2 +-
 NumLib/Distribution/Distribution.h                          | 2 +-
 NumLib/Extrapolation/Extrapolator.h                         | 2 +-
 NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp | 4 ++--
 NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h   | 2 +-
 NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h          | 5 ++---
 NumLib/Fem/CoordinatesMapping/ShapeMatrices.h               | 3 +--
 NumLib/Fem/FiniteElement/C0IsoparametricElements.h          | 2 +-
 NumLib/Fem/Integration/IntegrationPoint.h                   | 2 +-
 NumLib/Fem/ShapeFunction/ShapeHex20-impl.h                  | 5 ++---
 NumLib/Fem/ShapeFunction/ShapeHex20.h                       | 2 +-
 NumLib/Fem/ShapeFunction/ShapeHex8-impl.h                   | 3 +--
 NumLib/Fem/ShapeFunction/ShapeHex8.h                        | 2 +-
 NumLib/Fem/ShapeFunction/ShapeLine2-impl.h                  | 3 +--
 NumLib/Fem/ShapeFunction/ShapeLine2.h                       | 2 +-
 NumLib/Fem/ShapeFunction/ShapeLine3-impl.h                  | 3 +--
 NumLib/Fem/ShapeFunction/ShapeLine3.h                       | 2 +-
 NumLib/Fem/ShapeFunction/ShapePoint1.h                      | 2 +-
 NumLib/Fem/ShapeFunction/ShapePrism15-impl.h                | 3 +--
 NumLib/Fem/ShapeFunction/ShapePrism15.h                     | 2 +-
 NumLib/Fem/ShapeFunction/ShapePrism6-impl.h                 | 3 +--
 NumLib/Fem/ShapeFunction/ShapePrism6.h                      | 2 +-
 NumLib/Fem/ShapeFunction/ShapePyra13-impl.h                 | 3 +--
 NumLib/Fem/ShapeFunction/ShapePyra13.h                      | 2 +-
 NumLib/Fem/ShapeFunction/ShapePyra5-impl.h                  | 3 +--
 NumLib/Fem/ShapeFunction/ShapePyra5.h                       | 2 +-
 NumLib/Fem/ShapeFunction/ShapeQuad4-impl.h                  | 3 +--
 NumLib/Fem/ShapeFunction/ShapeQuad4.h                       | 2 +-
 NumLib/Fem/ShapeFunction/ShapeQuad8-impl.h                  | 3 +--
 NumLib/Fem/ShapeFunction/ShapeQuad8.h                       | 2 +-
 NumLib/Fem/ShapeFunction/ShapeQuad9-impl.h                  | 3 +--
 NumLib/Fem/ShapeFunction/ShapeQuad9.h                       | 2 +-
 NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp              | 2 +-
 NumLib/Fem/ShapeFunction/ShapeTet10-impl.h                  | 3 +--
 NumLib/Fem/ShapeFunction/ShapeTet10.h                       | 2 +-
 NumLib/Fem/ShapeFunction/ShapeTet4-impl.h                   | 3 +--
 NumLib/Fem/ShapeFunction/ShapeTet4.h                        | 2 +-
 NumLib/Fem/ShapeFunction/ShapeTri3-impl.h                   | 3 +--
 NumLib/Fem/ShapeFunction/ShapeTri3.h                        | 2 +-
 NumLib/Fem/ShapeFunction/ShapeTri6-impl.h                   | 3 +--
 NumLib/Fem/ShapeFunction/ShapeTri6.h                        | 2 +-
 NumLib/Fem/ShapeMatrixPolicy.h                              | 2 +-
 NumLib/Function/ISpatialFunction.h                          | 2 +-
 NumLib/Function/LinearInterpolationAlongPolyline.cpp        | 3 +--
 NumLib/Function/LinearInterpolationAlongPolyline.h          | 2 +-
 NumLib/Function/LinearInterpolationOnSurface.cpp            | 3 +--
 NumLib/Function/LinearInterpolationOnSurface.h              | 2 +-
 NumLib/Function/TemplateSpatialFunction.h                   | 2 +-
 NumLib/IndexValueVector.h                                   | 2 +-
 NumLib/ODESolver/ConvergenceCriterion.cpp                   | 2 +-
 NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp             | 2 +-
 NumLib/ODESolver/ConvergenceCriterionDeltaX.h               | 2 +-
 NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp | 2 +-
 .../ODESolver/ConvergenceCriterionPerComponentResidual.cpp  | 2 +-
 NumLib/ODESolver/ConvergenceCriterionResidual.cpp           | 2 +-
 NumLib/ODESolver/ConvergenceCriterionResidual.h             | 2 +-
 NumLib/ODESolver/EquationSystem.h                           | 2 +-
 NumLib/ODESolver/MatrixTranslator.cpp                       | 2 +-
 NumLib/ODESolver/MatrixTranslator.h                         | 2 +-
 NumLib/ODESolver/NonlinearSolver.cpp                        | 2 +-
 NumLib/ODESolver/NonlinearSystem.h                          | 2 +-
 NumLib/ODESolver/TimeDiscretization.cpp                     | 2 +-
 NumLib/ODESolver/TimeDiscretization.h                       | 2 +-
 NumLib/ODESolver/TimeDiscretizationBuilder.cpp              | 2 +-
 NumLib/ODESolver/TimeDiscretizedODESystem.h                 | 2 +-
 NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp        | 2 +-
 NumLib/TimeStepping/Algorithms/FixedTimeStepping.h          | 2 +-
 NumLib/TimeStepping/TimeStep.h                              | 2 +-
 ProcessLib/AbstractJacobianAssembler.h                      | 2 +-
 ProcessLib/AnalyticalJacobianAssembler.cpp                  | 2 +-
 ProcessLib/AnalyticalJacobianAssembler.h                    | 2 +-
 ProcessLib/BoundaryCondition/BoundaryCondition.h            | 2 +-
 ProcessLib/BoundaryCondition/BoundaryConditionCollection.h  | 3 +--
 .../ConstraintDirichletBoundaryConditionLocalAssembler.h    | 2 +-
 .../DirichletBoundaryConditionAuxiliaryFunctions.cpp        | 2 +-
 .../DirichletBoundaryConditionAuxiliaryFunctions.h          | 2 +-
 .../GenericNaturalBoundaryCondition-impl.h                  | 2 +-
 .../GenericNonuniformNaturalBoundaryCondition.h             | 2 +-
 ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp   | 2 +-
 ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h     | 2 +-
 .../NonuniformDirichletBoundaryCondition.cpp                | 2 +-
 .../NonuniformDirichletBoundaryCondition.h                  | 2 +-
 .../NonuniformNeumannBoundaryCondition.cpp                  | 2 +-
 .../BoundaryCondition/NonuniformNeumannBoundaryCondition.h  | 2 +-
 ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp     | 2 +-
 ProcessLib/BoundaryCondition/RobinBoundaryCondition.h       | 2 +-
 .../RobinBoundaryConditionLocalAssembler.h                  | 2 +-
 ProcessLib/CentralDifferencesJacobianAssembler.cpp          | 2 +-
 ProcessLib/CentralDifferencesJacobianAssembler.h            | 2 +-
 ProcessLib/CoupledSolutionsForStaggeredScheme.h             | 2 +-
 ProcessLib/CreateJacobianAssembler.cpp                      | 2 +-
 ProcessLib/Deformation/LinearBMatrix.h                      | 2 +-
 ProcessLib/HydroMechanics/CreateLocalAssemblers.h           | 4 ++--
 .../LiquidFlow/CreateLiquidFlowMaterialProperties.cpp       | 4 ++--
 ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.h  | 4 ++--
 ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp           | 4 ++--
 ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h             | 2 +-
 ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h       | 4 ++--
 ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h            | 4 ++--
 ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp      | 4 ++--
 ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h        | 4 ++--
 ProcessLib/LiquidFlow/LiquidFlowProcess.cpp                 | 4 ++--
 ProcessLib/LiquidFlow/LiquidFlowProcess.h                   | 4 ++--
 ProcessLib/LocalAssemblerTraits.h                           | 2 +-
 ProcessLib/Parameter/ConstantParameter.cpp                  | 2 +-
 ProcessLib/Parameter/ConstantParameter.h                    | 2 +-
 ProcessLib/Parameter/CurveScaledParameter.cpp               | 2 +-
 ProcessLib/Parameter/CurveScaledParameter.h                 | 2 +-
 ProcessLib/Parameter/FunctionParameter.cpp                  | 2 +-
 ProcessLib/Parameter/FunctionParameter.h                    | 2 +-
 ProcessLib/Parameter/GroupBasedParameter.cpp                | 2 +-
 ProcessLib/Parameter/GroupBasedParameter.h                  | 2 +-
 ProcessLib/Parameter/MeshElementParameter.cpp               | 2 +-
 ProcessLib/Parameter/MeshElementParameter.h                 | 2 +-
 ProcessLib/Parameter/MeshNodeParameter.cpp                  | 2 +-
 ProcessLib/Parameter/MeshNodeParameter.h                    | 2 +-
 ProcessLib/Parameter/Parameter.cpp                          | 2 +-
 ProcessLib/Parameter/SpatialPosition.h                      | 2 +-
 .../CreatePorousMediaProperties.cpp                         | 2 +-
 .../RichardsComponentTransport/PorousMediaProperties.cpp    | 4 ++--
 .../RichardsComponentTransport/PorousMediaProperties.h      | 4 ++--
 .../RichardsFlow/CreateRichardsFlowMaterialProperties.cpp   | 4 ++--
 .../RichardsFlow/CreateRichardsFlowMaterialProperties.h     | 2 +-
 ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.cpp  | 4 ++--
 ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.h    | 4 ++--
 ProcessLib/SmallDeformation/CreateLocalAssemblers.h         | 4 ++--
 ProcessLib/SourceTerms/SourceTermCollection.cpp             | 2 +-
 ProcessLib/SourceTerms/SourceTermCollection.h               | 2 +-
 ProcessLib/SourceTerms/SourceTermConfig.h                   | 2 +-
 ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h          | 2 +-
 ProcessLib/TES/TESLocalAssemblerData.cpp                    | 4 ++--
 ProcessLib/TES/TESLocalAssemblerData.h                      | 4 ++--
 ProcessLib/TES/TESLocalAssemblerInner-fwd.h                 | 4 ++--
 ProcessLib/TES/TESLocalAssemblerInner.cpp                   | 4 ++--
 ProcessLib/TES/TESOGS5MaterialModels.cpp                    | 4 ++--
 ProcessLib/TES/TESOGS5MaterialModels.h                      | 4 ++--
 .../CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp   | 4 ++--
 .../CreateThermalTwoPhaseFlowWithPPMaterialProperties.h     | 2 +-
 .../CreateThermalTwoPhaseFlowWithPPProcess.cpp              | 4 ++--
 .../CreateThermalTwoPhaseFlowWithPPProcess.h                | 4 ++--
 .../ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h          | 4 ++--
 .../ThermalTwoPhaseFlowWithPPLocalAssembler.h               | 4 ++--
 .../ThermalTwoPhaseFlowWithPPMaterialProperties.cpp         | 4 ++--
 .../ThermalTwoPhaseFlowWithPPMaterialProperties.h           | 4 ++--
 .../ThermalTwoPhaseFlowWithPPProcess.cpp                    | 4 ++--
 .../ThermalTwoPhaseFlowWithPPProcess.h                      | 4 ++--
 .../ThermalTwoPhaseFlowWithPPProcessData.h                  | 2 +-
 .../CreateTwoPhaseFlowWithPPMaterialProperties.cpp          | 4 ++--
 .../CreateTwoPhaseFlowWithPPMaterialProperties.h            | 2 +-
 .../TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp  | 4 ++--
 .../TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h    | 4 ++--
 .../TwoPhaseFlowWithPPLocalAssembler-impl.h                 | 4 ++--
 .../TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h   | 4 ++--
 .../TwoPhaseFlowWithPPMaterialProperties.cpp                | 4 ++--
 .../TwoPhaseFlowWithPPMaterialProperties.h                  | 4 ++--
 ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp | 4 ++--
 ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h   | 4 ++--
 .../CreateTwoPhaseFlowPrhoMaterialProperties.cpp            | 4 ++--
 .../CreateTwoPhaseFlowPrhoMaterialProperties.h              | 2 +-
 .../CreateTwoPhaseFlowWithPrhoProcess.cpp                   | 4 ++--
 .../CreateTwoPhaseFlowWithPrhoProcess.h                     | 4 ++--
 .../TwoPhaseFlowWithPrhoLocalAssembler-impl.h               | 4 ++--
 .../TwoPhaseFlowWithPrhoLocalAssembler.h                    | 4 ++--
 .../TwoPhaseFlowWithPrhoMaterialProperties.cpp              | 4 ++--
 .../TwoPhaseFlowWithPrhoMaterialProperties.h                | 4 ++--
 .../TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp    | 4 ++--
 .../TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h      | 4 ++--
 ProcessLib/Utils/CreateLocalAssemblers.h                    | 2 +-
 ProcessLib/Utils/InitShapeMatrices.h                        | 2 +-
 ProcessLib/Utils/ProcessUtils.h                             | 2 +-
 ProcessLib/VariableTransformation.h                         | 2 +-
 Tests/AutoCheckTools.h                                      | 2 +-
 Tests/MeshLib/TestAddLayerToMesh.cpp                        | 2 +-
 Tests/MeshLib/TestCoordinatesMappingLocal.cpp               | 4 ++--
 Tests/NumLib/CoordinatesMappingTestData/TestHex8.h          | 2 +-
 Tests/NumLib/CoordinatesMappingTestData/TestLine2.h         | 2 +-
 Tests/NumLib/CoordinatesMappingTestData/TestLine3.h         | 2 +-
 Tests/NumLib/CoordinatesMappingTestData/TestQuad4.h         | 2 +-
 Tests/NumLib/CoordinatesMappingTestData/TestTri3.h          | 2 +-
 Tests/NumLib/FeTestData/MatrixTools.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFeHEX20.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFeHEX8.h                        | 2 +-
 Tests/NumLib/FeTestData/TestFeLINE2.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFeLINE2Y.h                      | 2 +-
 Tests/NumLib/FeTestData/TestFeLINE3.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFePRISM15.h                     | 2 +-
 Tests/NumLib/FeTestData/TestFePRISM6.h                      | 2 +-
 Tests/NumLib/FeTestData/TestFePYRA13.h                      | 2 +-
 Tests/NumLib/FeTestData/TestFePYRA5.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFeQUAD4.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFeQUAD8.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFeQUAD9.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFeTET10.h                       | 2 +-
 Tests/NumLib/FeTestData/TestFeTET4.h                        | 2 +-
 Tests/NumLib/FeTestData/TestFeTRI3.h                        | 2 +-
 Tests/NumLib/FeTestData/TestFeTRI6.h                        | 2 +-
 Tests/NumLib/TestExtrapolation.cpp                          | 2 +-
 Tests/NumLib/TestFe.cpp                                     | 2 +-
 Tests/NumLib/TestGradShapeFunction.cpp                      | 2 +-
 Tests/NumLib/TestShapeFunctions.cpp                         | 2 +-
 Tests/ProcessLib/LIE/TestLIE.cpp                            | 2 +-
 466 files changed, 603 insertions(+), 643 deletions(-)

diff --git a/Applications/ApplicationsLib/LinearSolverLibrarySetup.h b/Applications/ApplicationsLib/LinearSolverLibrarySetup.h
index c6506b1bcc6..721f65f281c 100644
--- a/Applications/ApplicationsLib/LinearSolverLibrarySetup.h
+++ b/Applications/ApplicationsLib/LinearSolverLibrarySetup.h
@@ -71,5 +71,5 @@ struct LinearSolverLibrarySetup final
         NumLib::cleanupGlobalMatrixProviders();
     }
 };
-}    // ApplicationsLib
+}  // namespace ApplicationsLib
 #endif
diff --git a/Applications/ApplicationsLib/LogogSetup.h b/Applications/ApplicationsLib/LogogSetup.h
index 7b0a01d49cb..7a06b03289f 100644
--- a/Applications/ApplicationsLib/LogogSetup.h
+++ b/Applications/ApplicationsLib/LogogSetup.h
@@ -80,4 +80,4 @@ private:
     std::unique_ptr<logog::Cout> logog_cout;
 };
 
-}    // ApplicationsLib
+}  // namespace ApplicationsLib
diff --git a/Applications/DataHolderLib/Color.cpp b/Applications/DataHolderLib/Color.cpp
index 200a4a45504..a0e3662a232 100644
--- a/Applications/DataHolderLib/Color.cpp
+++ b/Applications/DataHolderLib/Color.cpp
@@ -55,4 +55,4 @@ Color const getColor(const std::string &id, std::map<std::string, Color> &colors
     return c;
 }
 
-}
+}  // namespace DataHolderLib
diff --git a/Applications/DataHolderLib/Color.h b/Applications/DataHolderLib/Color.h
index 40e286378b7..7b245c2f70b 100644
--- a/Applications/DataHolderLib/Color.h
+++ b/Applications/DataHolderLib/Color.h
@@ -36,4 +36,4 @@ Color const getColor(const std::string &id, std::map<std::string, DataHolderLib:
 
 /// Convenience function to use the getColor method with numbers as identifiers.
 Color const getColor(double id, std::map<std::string, DataHolderLib::Color> &colors);
-} // namespace
+}  // namespace DataHolderLib
diff --git a/Applications/DataHolderLib/ColorLookupTable.cpp b/Applications/DataHolderLib/ColorLookupTable.cpp
index b5c04cbe036..bde4cd65b37 100644
--- a/Applications/DataHolderLib/ColorLookupTable.cpp
+++ b/Applications/DataHolderLib/ColorLookupTable.cpp
@@ -38,6 +38,4 @@ void ColorLookupTable::setColor(std::string const& name, DataHolderLib::Color co
     _lut.emplace_back(0, color, name);
 }
 
-
-
-} // namespace
+}  // namespace DataHolderLib
diff --git a/Applications/DataHolderLib/ColorLookupTable.h b/Applications/DataHolderLib/ColorLookupTable.h
index a159f781684..317e54b258b 100644
--- a/Applications/DataHolderLib/ColorLookupTable.h
+++ b/Applications/DataHolderLib/ColorLookupTable.h
@@ -65,4 +65,4 @@ private:
     std::pair<double, double> _range;
 };
 
-} // namespace
+}  // namespace DataHolderLib
diff --git a/Applications/DataHolderLib/Project.cpp b/Applications/DataHolderLib/Project.cpp
index e556cfb77a8..1a03bb81f59 100644
--- a/Applications/DataHolderLib/Project.cpp
+++ b/Applications/DataHolderLib/Project.cpp
@@ -145,4 +145,4 @@ void Project::removeSourceTerm(std::string const& primary_var_name,
     }
 }
 
-} //namespace
+}  // namespace DataHolderLib
diff --git a/Applications/DataHolderLib/Project.h b/Applications/DataHolderLib/Project.h
index 09d334968ed..0b31b4ba1ac 100644
--- a/Applications/DataHolderLib/Project.h
+++ b/Applications/DataHolderLib/Project.h
@@ -122,4 +122,4 @@ private:
     std::vector<std::unique_ptr<SourceTerm>> _source_terms;
 };
 
-} // namespace
+}  // namespace DataHolderLib
diff --git a/Applications/FileIO/CsvInterface.h b/Applications/FileIO/CsvInterface.h
index ad488877d5d..0206d0c99ab 100644
--- a/Applications/FileIO/CsvInterface.h
+++ b/Applications/FileIO/CsvInterface.h
@@ -238,4 +238,4 @@ private:
     std::vector< boost::any > _data;
 };
 
-} // FileIO
+}  // namespace FileIO
diff --git a/Applications/FileIO/GMSInterface.cpp b/Applications/FileIO/GMSInterface.cpp
index d5761533b86..a1ef78069d5 100644
--- a/Applications/FileIO/GMSInterface.cpp
+++ b/Applications/FileIO/GMSInterface.cpp
@@ -349,4 +349,4 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(const std::string &filename)
     return new MeshLib::Mesh(mesh_name, nodes, elements, properties);
 }
 
-}
+}  // namespace FileIO
diff --git a/Applications/FileIO/GMSInterface.h b/Applications/FileIO/GMSInterface.h
index 269c2058c92..c9ef4b3d55b 100644
--- a/Applications/FileIO/GMSInterface.h
+++ b/Applications/FileIO/GMSInterface.h
@@ -78,4 +78,4 @@ private:
     static std::size_t getSoilID(std::vector<std::string> &soilID, std::string &soilName);
 };
 
-}
+}  // namespace FileIO
diff --git a/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp b/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp
index d33b60070a0..76a4752a147 100644
--- a/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp
+++ b/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp
@@ -158,6 +158,6 @@ void GMSHAdaptiveMeshDensity::getQuadTreeGeometry(std::vector<GeoLib::Point*> &p
     }
 }
 #endif
-}
+}  // namespace GMSH
 
 } // end namespace FileIO
diff --git a/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h b/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h
index 2a3e41e79b5..f1036515ddf 100644
--- a/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h
+++ b/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h
@@ -52,5 +52,5 @@ private:
     GeoLib::QuadTree<GeoLib::Point> *_quad_tree;
 };
 
-}
+}  // namespace GMSH
 } // end namespace FileIO
diff --git a/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.cpp b/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.cpp
index 08f9593b8ce..1a5198facb3 100644
--- a/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.cpp
+++ b/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.cpp
@@ -36,5 +36,5 @@ double GMSHFixedMeshDensity::getMeshDensityAtStation(GeoLib::Point const*const)
     return _mesh_density;
 }
 
-}
+}  // namespace GMSH
 } // end namespace FileIO
diff --git a/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h b/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
index 23d3f8b577b..c3f1814cd7d 100644
--- a/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
+++ b/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
@@ -30,5 +30,5 @@ private:
     double _mesh_density;
 };
 
-}
+}  // namespace GMSH
 } // end namespace FileIO
diff --git a/Applications/FileIO/Legacy/OGSIOVer4.cpp b/Applications/FileIO/Legacy/OGSIOVer4.cpp
index d29437f6cb1..6ae7743ae04 100644
--- a/Applications/FileIO/Legacy/OGSIOVer4.cpp
+++ b/Applications/FileIO/Legacy/OGSIOVer4.cpp
@@ -697,5 +697,5 @@ void writeAllDataToGLIFileV4 (const std::string& fname, const GeoLib::GEOObjects
     os.close ();
 }
 
-}
+}  // namespace Legacy
 } // end namespace FileIO
diff --git a/Applications/FileIO/Legacy/OGSIOVer4.h b/Applications/FileIO/Legacy/OGSIOVer4.h
index f5998e0ffd7..b66f900c232 100644
--- a/Applications/FileIO/Legacy/OGSIOVer4.h
+++ b/Applications/FileIO/Legacy/OGSIOVer4.h
@@ -42,5 +42,5 @@ void writeGLIFileV4 (const std::string& fname,
 /** Writes all geometric information to a gli-file */
 void writeAllDataToGLIFileV4 (const std::string& fname, const GeoLib::GEOObjects& geo);
 
-}
+}  // namespace Legacy
 } // end namespace FileIO
diff --git a/Applications/FileIO/Legacy/createSurface.cpp b/Applications/FileIO/Legacy/createSurface.cpp
index b7ad63fd19e..a45bd63c222 100644
--- a/Applications/FileIO/Legacy/createSurface.cpp
+++ b/Applications/FileIO/Legacy/createSurface.cpp
@@ -123,4 +123,4 @@ bool createSurface(GeoLib::Polyline const& ply,
     return true;
 }
 
-} // end namespace
+}  // namespace FileIO
diff --git a/Applications/FileIO/Legacy/createSurface.h b/Applications/FileIO/Legacy/createSurface.h
index e559fe1a962..36162aa13a4 100644
--- a/Applications/FileIO/Legacy/createSurface.h
+++ b/Applications/FileIO/Legacy/createSurface.h
@@ -27,4 +27,4 @@ namespace FileIO
 bool createSurface(GeoLib::Polyline const& polyline,
                    GeoLib::GEOObjects& geometries,
                    std::string const& geometry_name);
-}
+}  // namespace FileIO
diff --git a/Applications/FileIO/SHPInterface.cpp b/Applications/FileIO/SHPInterface.cpp
index 35090a4dbd8..32d41d0276c 100644
--- a/Applications/FileIO/SHPInterface.cpp
+++ b/Applications/FileIO/SHPInterface.cpp
@@ -279,4 +279,4 @@ bool SHPInterface::write2dMeshToSHP(const std::string &file_name, const MeshLib:
     return true;
 }
 
-}
+}  // namespace FileIO
diff --git a/Applications/FileIO/SHPInterface.h b/Applications/FileIO/SHPInterface.h
index adfadab5718..cdcc554bbe2 100644
--- a/Applications/FileIO/SHPInterface.h
+++ b/Applications/FileIO/SHPInterface.h
@@ -83,4 +83,4 @@ private:
     GeoLib::GEOObjects& _geoObjects;
 };
 
-}
+}  // namespace FileIO
diff --git a/Applications/FileIO/TetGenInterface.h b/Applications/FileIO/TetGenInterface.h
index 18c3b0f6e68..c02358ac359 100644
--- a/Applications/FileIO/TetGenInterface.h
+++ b/Applications/FileIO/TetGenInterface.h
@@ -214,4 +214,4 @@ private:
     /// true if boundary markers are set, false otherwise
     bool _boundary_markers;
 };
-}
+}  // namespace FileIO
diff --git a/Applications/FileIO/readGeometryFromFile.cpp b/Applications/FileIO/readGeometryFromFile.cpp
index e1bb9791732..4f355b73ac8 100644
--- a/Applications/FileIO/readGeometryFromFile.cpp
+++ b/Applications/FileIO/readGeometryFromFile.cpp
@@ -42,4 +42,4 @@ readGeometryFromFile(std::string const& fname, GeoLib::GEOObjects & geo_objs)
                   "Something is wrong in the reading function.");
     }
 }
-}
+}  // namespace FileIO
diff --git a/Applications/FileIO/writeGeometryToFile.cpp b/Applications/FileIO/writeGeometryToFile.cpp
index c7a528198f2..0c279cbde36 100644
--- a/Applications/FileIO/writeGeometryToFile.cpp
+++ b/Applications/FileIO/writeGeometryToFile.cpp
@@ -34,4 +34,4 @@ void writeGeometryToFile(std::string const& geo_name,
             " the required format from file extension.");
     }
 }
-}
+}  // namespace FileIO
diff --git a/BaseLib/BuildInfo.h b/BaseLib/BuildInfo.h
index 544ccc7a8c7..1eda014d139 100644
--- a/BaseLib/BuildInfo.h
+++ b/BaseLib/BuildInfo.h
@@ -38,5 +38,5 @@ namespace BuildInfo
     extern BASELIB_EXPORT const std::string data_path;
     extern BASELIB_EXPORT const std::string data_binary_path;
     extern BASELIB_EXPORT const std::string tests_tmp_path;
-}
-}
+    }  // namespace BuildInfo
+    }  // namespace BaseLib
diff --git a/BaseLib/ConfigTree-impl.h b/BaseLib/ConfigTree-impl.h
index 87ddab369ad..76cb7fa5f44 100644
--- a/BaseLib/ConfigTree-impl.h
+++ b/BaseLib/ConfigTree-impl.h
@@ -248,4 +248,4 @@ markVisited(std::string const& key, Attr const is_attr,
     return p.first->second;
 }
 
-}
+}  // namespace BaseLib
diff --git a/BaseLib/ConfigTree.cpp b/BaseLib/ConfigTree.cpp
index 21196c27c8b..e96d729cded 100644
--- a/BaseLib/ConfigTree.cpp
+++ b/BaseLib/ConfigTree.cpp
@@ -438,4 +438,4 @@ void checkAndInvalidate(std::unique_ptr<ConfigTree> const& conf)
     if (conf) conf->checkAndInvalidate();
 }
 
-}
+}  // namespace BaseLib
diff --git a/BaseLib/ConfigTree.h b/BaseLib/ConfigTree.h
index cc50ba47322..1c363bee6b0 100644
--- a/BaseLib/ConfigTree.h
+++ b/BaseLib/ConfigTree.h
@@ -643,6 +643,6 @@ private:
     friend void checkAndInvalidate(std::unique_ptr<ConfigTree> const& conf);
 };
 
-}
+}  // namespace BaseLib
 
 #include "ConfigTree-impl.h"
diff --git a/BaseLib/ConfigTreeUtil.cpp b/BaseLib/ConfigTreeUtil.cpp
index 117c4145315..93f0a647a32 100644
--- a/BaseLib/ConfigTreeUtil.cpp
+++ b/BaseLib/ConfigTreeUtil.cpp
@@ -75,4 +75,4 @@ makeConfigTree(const std::string& filepath, const bool be_ruthless,
               filepath.c_str());
 }
 
-}
+}  // namespace BaseLib
diff --git a/BaseLib/ConfigTreeUtil.h b/BaseLib/ConfigTreeUtil.h
index 1d5a187a3dc..4bfec5085af 100644
--- a/BaseLib/ConfigTreeUtil.h
+++ b/BaseLib/ConfigTreeUtil.h
@@ -87,4 +87,4 @@ ConfigTreeTopLevel
 makeConfigTree(std::string const& filepath, bool const be_ruthless,
                std::string const& toplevel_tag);
 
-}
+}  // namespace BaseLib
diff --git a/BaseLib/Functional.cpp b/BaseLib/Functional.cpp
index 8162fa6e587..73c1efa8460 100644
--- a/BaseLib/Functional.cpp
+++ b/BaseLib/Functional.cpp
@@ -28,6 +28,6 @@ DEFINE_INDEXEDPLACEHOLDER_MEMBER(6, 7);
 DEFINE_INDEXEDPLACEHOLDER_MEMBER(7, 8);
 DEFINE_INDEXEDPLACEHOLDER_MEMBER(8, 9);
 DEFINE_INDEXEDPLACEHOLDER_MEMBER(9, 10);
-}
+}  // namespace detail
 
 }  // namespace BaseLib
diff --git a/BaseLib/IO/XmlIO/XMLInterface.cpp b/BaseLib/IO/XmlIO/XMLInterface.cpp
index a2e011139f3..126f2ee0e7a 100644
--- a/BaseLib/IO/XmlIO/XMLInterface.cpp
+++ b/BaseLib/IO/XmlIO/XMLInterface.cpp
@@ -24,4 +24,4 @@ XMLInterface::XMLInterface() :
 {}
 
 }
-}
+}  // namespace BaseLib
diff --git a/BaseLib/IO/XmlIO/XMLInterface.h b/BaseLib/IO/XmlIO/XMLInterface.h
index 6d2b8bcc9b8..7de12dd35ae 100644
--- a/BaseLib/IO/XmlIO/XMLInterface.h
+++ b/BaseLib/IO/XmlIO/XMLInterface.h
@@ -38,5 +38,5 @@ protected:
     std::string _exportName;
 };
 
-}
-}
+}  // namespace IO
+}  // namespace BaseLib
diff --git a/BaseLib/MemWatch.h b/BaseLib/MemWatch.h
index a7e7341067e..4d11181a1ca 100644
--- a/BaseLib/MemWatch.h
+++ b/BaseLib/MemWatch.h
@@ -32,4 +32,4 @@ private:
     unsigned long _cmem_size = 0;
 };
 
-}
+}  // namespace BaseLib
diff --git a/BaseLib/Subdivision.h b/BaseLib/Subdivision.h
index 97516210974..49ba120cf4d 100644
--- a/BaseLib/Subdivision.h
+++ b/BaseLib/Subdivision.h
@@ -112,4 +112,4 @@ private:
     const double _multiplier;
 };
 
-} // BaseLib
+}  // namespace BaseLib
diff --git a/BaseLib/TimeInterval.cpp b/BaseLib/TimeInterval.cpp
index 9058d3f3a9c..161f0585053 100644
--- a/BaseLib/TimeInterval.cpp
+++ b/BaseLib/TimeInterval.cpp
@@ -33,4 +33,4 @@ std::unique_ptr<TimeInterval> createTimeInterval(
 
     return std::make_unique<BaseLib::TimeInterval>(start_time, end_time);
 }
-}  // end of namespace
+}  // namespace BaseLib
diff --git a/BaseLib/TimeInterval.h b/BaseLib/TimeInterval.h
index 8d2a68361f5..c21fb7dda9d 100644
--- a/BaseLib/TimeInterval.h
+++ b/BaseLib/TimeInterval.h
@@ -47,4 +47,4 @@ private:
 std::unique_ptr<TimeInterval> createTimeInterval(
     BaseLib::ConfigTree const& config);
 
-}  // end of namespace
+}  // namespace BaseLib
diff --git a/GeoLib/AABB.h b/GeoLib/AABB.h
index 2ac4d543618..874def54e57 100644
--- a/GeoLib/AABB.h
+++ b/GeoLib/AABB.h
@@ -240,4 +240,4 @@ private:
         update(*pnt);
     }
 };
-} // end namespace
+}  // namespace GeoLib
diff --git a/GeoLib/AnalyticalGeometry.cpp b/GeoLib/AnalyticalGeometry.cpp
index 283a4a955b0..dd210eb7607 100644
--- a/GeoLib/AnalyticalGeometry.cpp
+++ b/GeoLib/AnalyticalGeometry.cpp
@@ -50,7 +50,7 @@ double getOrientation2dFast(MathLib::Point3d const& a,
                         const_cast<double*>(b.getCoords()),
                         const_cast<double*>(c.getCoords()));
 }
-}
+}  // namespace ExactPredicates
 
 namespace GeoLib
 {
diff --git a/GeoLib/DuplicateGeometry.cpp b/GeoLib/DuplicateGeometry.cpp
index d9eb3e3e887..ddfa0ca0df2 100644
--- a/GeoLib/DuplicateGeometry.cpp
+++ b/GeoLib/DuplicateGeometry.cpp
@@ -117,4 +117,4 @@ std::vector<GeoLib::Surface*>& DuplicateGeometry::getSurfaceVectorCopy()
     return const_cast<std::vector<GeoLib::Surface*>&>(*_geo_objects.getSurfaceVec(_output_name));
 }
 
-}
+}  // namespace GeoLib
diff --git a/GeoLib/DuplicateGeometry.h b/GeoLib/DuplicateGeometry.h
index 1a29866a653..84aea52dbd3 100644
--- a/GeoLib/DuplicateGeometry.h
+++ b/GeoLib/DuplicateGeometry.h
@@ -63,4 +63,4 @@ private:
 
 }; // class
 
-} // namespace
+}  // namespace GeoLib
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index 15562145f91..d353b5522ad 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -704,5 +704,4 @@ std::size_t GEOObjects::exists(const std::string &geometry_name) const
     return std::numeric_limits<std::size_t>::max();
 }
 
-
-} // namespace
+}  // namespace GeoLib
diff --git a/GeoLib/GEOObjects.h b/GeoLib/GEOObjects.h
index a3a9779bc83..89baa730d12 100644
--- a/GeoLib/GEOObjects.h
+++ b/GeoLib/GEOObjects.h
@@ -380,4 +380,4 @@ private:
     void markUnusedPoints(std::string const& geo_name,
                           std::vector<bool>& transfer_pnts) const;
 };
-} // end namespace
+}  // namespace GeoLib
diff --git a/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp b/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp
index a9a3345fd84..0ffb4f8fea6 100644
--- a/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp
+++ b/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp
@@ -253,5 +253,5 @@ void RapidStnInterface::readStratigraphy( const rapidxml::xml_node<>* strat_root
     }
 }
 
-} // IO
-} // GeoLib
+}  // namespace IO
+}  // namespace GeoLib
diff --git a/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.h b/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.h
index 487ad84813f..ab3e4bbf0e6 100644
--- a/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.h
+++ b/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.h
@@ -48,5 +48,5 @@ private:
     static void readStratigraphy(const rapidxml::xml_node<>* strat_root, GeoLib::StationBorehole* borehole);
 };
 
-} // IO
-} // GeoLib
+}  // namespace IO
+}  // namespace GeoLib
diff --git a/GeoLib/LineSegment.cpp b/GeoLib/LineSegment.cpp
index f9d6b4f1f9c..b8074cae5f9 100644
--- a/GeoLib/LineSegment.cpp
+++ b/GeoLib/LineSegment.cpp
@@ -101,4 +101,4 @@ bool operator==(LineSegment const& s0, LineSegment const& s1)
         (MathLib::sqrDist(s0.getBeginPoint(), s1.getEndPoint()) < tol &&
          MathLib::sqrDist(s0.getEndPoint(), s1.getBeginPoint()) < tol);
 }
-}
+}  // namespace GeoLib
diff --git a/GeoLib/LineSegment.h b/GeoLib/LineSegment.h
index 73b852aa3d9..38a1c465c4a 100644
--- a/GeoLib/LineSegment.h
+++ b/GeoLib/LineSegment.h
@@ -58,4 +58,4 @@ std::ostream& operator<<(std::ostream& os,
 ///  of double.
 bool operator==(LineSegment const& s0, LineSegment const& s1);
 
-}
+}  // namespace GeoLib
diff --git a/GeoLib/MinimalBoundingSphere.cpp b/GeoLib/MinimalBoundingSphere.cpp
index d473b2ac6db..05568ca7146 100644
--- a/GeoLib/MinimalBoundingSphere.cpp
+++ b/GeoLib/MinimalBoundingSphere.cpp
@@ -206,4 +206,4 @@ std::vector<MathLib::Point3d*>* MinimalBoundingSphere::getRandomSpherePoints(std
     return pnts;
 }
 
-}
+}  // namespace GeoLib
diff --git a/GeoLib/MinimalBoundingSphere.h b/GeoLib/MinimalBoundingSphere.h
index b724582cb57..adb9b6e5836 100644
--- a/GeoLib/MinimalBoundingSphere.h
+++ b/GeoLib/MinimalBoundingSphere.h
@@ -84,4 +84,4 @@ private:
     MathLib::Vector3 _center;
 };
 
-} // namespace
+}  // namespace GeoLib
diff --git a/GeoLib/Point.h b/GeoLib/Point.h
index 1f29cb5f804..f8af4d5f3ad 100644
--- a/GeoLib/Point.h
+++ b/GeoLib/Point.h
@@ -60,4 +60,4 @@ protected:
     void setID(std::size_t id) { _id = id; }
 };
 
-}
+}  // namespace GeoLib
diff --git a/GeoLib/PointVec.cpp b/GeoLib/PointVec.cpp
index d5b69bb9333..0f7611e9230 100644
--- a/GeoLib/PointVec.cpp
+++ b/GeoLib/PointVec.cpp
@@ -268,4 +268,4 @@ void PointVec::resetInternalDataStructures()
     }
 }
 
-}  // end namespace
+}  // namespace GeoLib
diff --git a/GeoLib/PointVec.h b/GeoLib/PointVec.h
index a7b85ff0c4c..030cfddbf18 100644
--- a/GeoLib/PointVec.h
+++ b/GeoLib/PointVec.h
@@ -157,4 +157,4 @@ private:
     double _rel_eps;
     std::unique_ptr<GeoLib::OctTree<GeoLib::Point, 16>> _oct_tree;
 };
-} // end namespace
+}  // namespace GeoLib
diff --git a/GeoLib/PolygonWithSegmentMarker.cpp b/GeoLib/PolygonWithSegmentMarker.cpp
index 0330436be45..cf253e5c432 100644
--- a/GeoLib/PolygonWithSegmentMarker.cpp
+++ b/GeoLib/PolygonWithSegmentMarker.cpp
@@ -45,4 +45,4 @@ bool PolygonWithSegmentMarker::insertPoint(std::size_t pos, std::size_t pnt_id)
     return false;
 }
 
-} // end GeoLib
+}  // namespace GeoLib
diff --git a/GeoLib/Polyline.h b/GeoLib/Polyline.h
index 1eb7b6908e6..a37a258a615 100644
--- a/GeoLib/Polyline.h
+++ b/GeoLib/Polyline.h
@@ -261,4 +261,4 @@ bool operator==(Polyline const& lhs, Polyline const& rhs);
 
 bool pointsAreIdentical(const std::vector<Point*> &pnt_vec, std::size_t i, std::size_t j,
                         double prox);
-} // end namespace
+}  // namespace GeoLib
diff --git a/GeoLib/PolylineVec.h b/GeoLib/PolylineVec.h
index 683fe5ed62a..7813bb24b17 100644
--- a/GeoLib/PolylineVec.h
+++ b/GeoLib/PolylineVec.h
@@ -28,4 +28,4 @@ namespace GeoLib {
 
 using PolylineVec = TemplateVec<GeoLib::Polyline>;
 
-} // end namespace
+}  // namespace GeoLib
diff --git a/GeoLib/PolylineWithSegmentMarker.cpp b/GeoLib/PolylineWithSegmentMarker.cpp
index 83795209abb..3119acba8b5 100644
--- a/GeoLib/PolylineWithSegmentMarker.cpp
+++ b/GeoLib/PolylineWithSegmentMarker.cpp
@@ -49,4 +49,4 @@ bool PolylineWithSegmentMarker::insertPoint(std::size_t pos, std::size_t pnt_id)
     return false;
 }
 
-} // end GeoLib
+}  // namespace GeoLib
diff --git a/GeoLib/PolylineWithSegmentMarker.h b/GeoLib/PolylineWithSegmentMarker.h
index 78cc3812cd7..87b0cec9511 100644
--- a/GeoLib/PolylineWithSegmentMarker.h
+++ b/GeoLib/PolylineWithSegmentMarker.h
@@ -57,4 +57,4 @@ private:
     std::vector<bool> _marker;
 };
 
-}
+}  // namespace GeoLib
diff --git a/GeoLib/QuadTree.h b/GeoLib/QuadTree.h
index 6a7e49801d2..3583aab1d63 100644
--- a/GeoLib/QuadTree.h
+++ b/GeoLib/QuadTree.h
@@ -505,4 +505,4 @@ private:
      */
     const std::size_t _max_points_per_leaf;
 };
-}
+}  // namespace GeoLib
diff --git a/GeoLib/Raster.h b/GeoLib/Raster.h
index 9d461c3afe0..5bda05f0937 100644
--- a/GeoLib/Raster.h
+++ b/GeoLib/Raster.h
@@ -108,4 +108,4 @@ private:
     double* _raster_data;
 };
 
-}
+}  // namespace GeoLib
diff --git a/GeoLib/Station.cpp b/GeoLib/Station.cpp
index 4b8bff29f4e..d2c53953c00 100644
--- a/GeoLib/Station.cpp
+++ b/GeoLib/Station.cpp
@@ -88,5 +88,4 @@ bool isStation(GeoLib::Point const* pnt)
     return bh != nullptr;
 }
 
-} // namespace
-
+}  // namespace GeoLib
diff --git a/GeoLib/Station.h b/GeoLib/Station.h
index 00ae4aa0bcf..1f50b59723e 100644
--- a/GeoLib/Station.h
+++ b/GeoLib/Station.h
@@ -104,4 +104,4 @@ private:
 };
 
 bool isStation(GeoLib::Point const* pnt);
-} // namespace
+}  // namespace GeoLib
diff --git a/GeoLib/StationBorehole.cpp b/GeoLib/StationBorehole.cpp
index 89b80ed3e75..b3ff212f945 100644
--- a/GeoLib/StationBorehole.cpp
+++ b/GeoLib/StationBorehole.cpp
@@ -304,4 +304,4 @@ bool isBorehole(GeoLib::Point const* pnt)
     return bh != nullptr;
 }
 
-} // namespace
+}  // namespace GeoLib
diff --git a/GeoLib/StationBorehole.h b/GeoLib/StationBorehole.h
index 4b9a657024d..e8861b01f6c 100644
--- a/GeoLib/StationBorehole.h
+++ b/GeoLib/StationBorehole.h
@@ -117,4 +117,4 @@ private:
 
 bool isBorehole(GeoLib::Point const* pnt);
 
-} // namespace
+}  // namespace GeoLib
diff --git a/GeoLib/Surface.cpp b/GeoLib/Surface.cpp
index 97fc8c2491e..b56ccf24096 100644
--- a/GeoLib/Surface.cpp
+++ b/GeoLib/Surface.cpp
@@ -122,4 +122,4 @@ const Triangle* Surface::findTriangle(MathLib::Point3d const& pnt) const
     return nullptr;
 }
 
-} // end namespace
+}  // namespace GeoLib
diff --git a/GeoLib/Surface.h b/GeoLib/Surface.h
index 8971f480cc1..048e2d059f1 100644
--- a/GeoLib/Surface.h
+++ b/GeoLib/Surface.h
@@ -99,4 +99,4 @@ protected:
     /// called and a valid surface grid is not existing.
     mutable std::unique_ptr<SurfaceGrid> _surface_grid;
 };
-}
+}  // namespace GeoLib
diff --git a/MaterialLib/Adsorption/Adsorption.cpp b/MaterialLib/Adsorption/Adsorption.cpp
index 92ab5b76792..d6ceb5d7c52 100644
--- a/MaterialLib/Adsorption/Adsorption.cpp
+++ b/MaterialLib/Adsorption/Adsorption.cpp
@@ -184,6 +184,4 @@ double AdsorptionReaction::getEquilibriumLoading(
     return getAdsorbateDensity(T_Ads) * characteristicCurve(A);
 }
 
-
-
-} // namespace Ads
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/Adsorption.h b/MaterialLib/Adsorption/Adsorption.h
index 8eb7bb92129..ae7b05a4025 100644
--- a/MaterialLib/Adsorption/Adsorption.h
+++ b/MaterialLib/Adsorption/Adsorption.h
@@ -82,4 +82,4 @@ inline double dCurvePolyfrac(const double* coeffs, const double x)
     return (du*v - u*dv) / v / v;
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/Density100MPa.cpp b/MaterialLib/Adsorption/Density100MPa.cpp
index 88e24c49049..89400b43883 100644
--- a/MaterialLib/Adsorption/Density100MPa.cpp
+++ b/MaterialLib/Adsorption/Density100MPa.cpp
@@ -24,7 +24,7 @@ const double c[] = {
     -9.919599580166727e-11    /* a6 */
 };
 
-}
+}  // namespace
 
 namespace Adsorption
 {
@@ -60,4 +60,4 @@ double Density100MPa::dCharacteristicCurve(const double A) const
     return dCurvePolyfrac(c, A);
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/Density100MPa.h b/MaterialLib/Adsorption/Density100MPa.h
index d100d341cd6..e13fe9a8701 100644
--- a/MaterialLib/Adsorption/Density100MPa.h
+++ b/MaterialLib/Adsorption/Density100MPa.h
@@ -23,4 +23,4 @@ public:
     double dCharacteristicCurve(const double A) const override;
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityConst.cpp b/MaterialLib/Adsorption/DensityConst.cpp
index 736c9f435af..c1f48961e46 100644
--- a/MaterialLib/Adsorption/DensityConst.cpp
+++ b/MaterialLib/Adsorption/DensityConst.cpp
@@ -25,7 +25,7 @@ const double c[] = {
     -1.0668790477629686e-10        /* a6 */
 };
 
-}
+}  // namespace
 
 namespace Adsorption
 {
@@ -57,4 +57,4 @@ double DensityConst::dCharacteristicCurve(const double A) const
     return dCurvePolyfrac(c, A);
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityConst.h b/MaterialLib/Adsorption/DensityConst.h
index 172fd663ea5..4aa41e4ae7a 100644
--- a/MaterialLib/Adsorption/DensityConst.h
+++ b/MaterialLib/Adsorption/DensityConst.h
@@ -23,4 +23,4 @@ public:
     double dCharacteristicCurve(const double A) const override;
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityCook.cpp b/MaterialLib/Adsorption/DensityCook.cpp
index 301e524e8cb..35a12dabe0a 100644
--- a/MaterialLib/Adsorption/DensityCook.cpp
+++ b/MaterialLib/Adsorption/DensityCook.cpp
@@ -24,7 +24,7 @@ const double c[] = {
     -1.037977321231462e-10    /* a6 */
 };
 
-}
+}  // namespace
 
 namespace Adsorption
 {
@@ -56,4 +56,4 @@ double DensityCook::dCharacteristicCurve(const double A) const
     return dCurvePolyfrac(c, A);
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityCook.h b/MaterialLib/Adsorption/DensityCook.h
index ad6ab60034f..fa90f2a1127 100644
--- a/MaterialLib/Adsorption/DensityCook.h
+++ b/MaterialLib/Adsorption/DensityCook.h
@@ -54,4 +54,4 @@ inline double alphaTWaterDean(const double T_Ads)
     return aT_100 / (1. - aT_100 * (Tcel - 100.));
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityDubinin.cpp b/MaterialLib/Adsorption/DensityDubinin.cpp
index f7731dda770..054915c7cf9 100644
--- a/MaterialLib/Adsorption/DensityDubinin.cpp
+++ b/MaterialLib/Adsorption/DensityDubinin.cpp
@@ -27,7 +27,7 @@ const double c[] = {
     -1.0477401124006098e-10    /* a6 */
 };
 
-}
+}  // namespace
 
 namespace Adsorption
 {
@@ -91,4 +91,4 @@ double DensityDubinin::dCharacteristicCurve(const double A) const
     return dCurvePolyfrac(c, A);
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityDubinin.h b/MaterialLib/Adsorption/DensityDubinin.h
index ac9516140d5..fd026c01213 100644
--- a/MaterialLib/Adsorption/DensityDubinin.h
+++ b/MaterialLib/Adsorption/DensityDubinin.h
@@ -23,4 +23,4 @@ public:
     double dCharacteristicCurve(const double A) const override;
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityHauer.cpp b/MaterialLib/Adsorption/DensityHauer.cpp
index 38daaa957a5..c6f5b17f720 100644
--- a/MaterialLib/Adsorption/DensityHauer.cpp
+++ b/MaterialLib/Adsorption/DensityHauer.cpp
@@ -24,7 +24,7 @@ const double c[] = {
     -1.0300151379421499e-10    /* a6 */
 };
 
-}
+}  // namespace
 
 namespace Adsorption
 {
@@ -60,4 +60,4 @@ double DensityHauer::dCharacteristicCurve(const double A) const
     return dCurvePolyfrac(c, A);
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityHauer.h b/MaterialLib/Adsorption/DensityHauer.h
index 7c49be66ecc..ce034699ab6 100644
--- a/MaterialLib/Adsorption/DensityHauer.h
+++ b/MaterialLib/Adsorption/DensityHauer.h
@@ -32,4 +32,4 @@ inline double rhoWaterHauer(const double T_Ads)
     return rho0 * (1. - alpha0 * (T_Ads-T0)); // in kg/m^3
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityLegacy.cpp b/MaterialLib/Adsorption/DensityLegacy.cpp
index 76468d5af3a..9eda437d24e 100644
--- a/MaterialLib/Adsorption/DensityLegacy.cpp
+++ b/MaterialLib/Adsorption/DensityLegacy.cpp
@@ -22,7 +22,7 @@ const double c[] = { 0.34102920966608297,
                      -7.610441241719489e-11
                    };
 
-}
+}  // namespace
 
 namespace Adsorption
 {
@@ -61,4 +61,4 @@ double DensityLegacy::dCharacteristicCurve(const double A) const
     return dCurvePolyfrac(c, A);
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityLegacy.h b/MaterialLib/Adsorption/DensityLegacy.h
index d434ecb86fb..888933157e9 100644
--- a/MaterialLib/Adsorption/DensityLegacy.h
+++ b/MaterialLib/Adsorption/DensityLegacy.h
@@ -23,4 +23,4 @@ public:
     double dCharacteristicCurve(const double A) const override;
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityMette.cpp b/MaterialLib/Adsorption/DensityMette.cpp
index b60ee6f0f2c..d0f96151ced 100644
--- a/MaterialLib/Adsorption/DensityMette.cpp
+++ b/MaterialLib/Adsorption/DensityMette.cpp
@@ -23,7 +23,7 @@ const double c[] = {
     6.854673678427112e-10,    /* a5 */
     -1.0197050219481966e-10    /* a6 */
 };
-}
+}  // namespace
 
 namespace Adsorption
 {
@@ -63,4 +63,4 @@ double DensityMette::dCharacteristicCurve(const double A) const
     return dCurvePolyfrac(c, A);
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityMette.h b/MaterialLib/Adsorption/DensityMette.h
index f83da39eb7f..a0e43b1435d 100644
--- a/MaterialLib/Adsorption/DensityMette.h
+++ b/MaterialLib/Adsorption/DensityMette.h
@@ -23,4 +23,4 @@ public:
     double dCharacteristicCurve(const double A) const override;
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityNunez.cpp b/MaterialLib/Adsorption/DensityNunez.cpp
index 12df1282920..cd3bafb6a3c 100644
--- a/MaterialLib/Adsorption/DensityNunez.cpp
+++ b/MaterialLib/Adsorption/DensityNunez.cpp
@@ -24,7 +24,7 @@ const double c[] = {
     -1.0345385018952998e-10    /* a6 */
 };
 
-}
+}  // namespace
 
 namespace Adsorption
 {
@@ -71,4 +71,4 @@ double DensityNunez::dCharacteristicCurve(const double A) const
     return dCurvePolyfrac(c, A);
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityNunez.h b/MaterialLib/Adsorption/DensityNunez.h
index c3726c1a933..2c6c5718417 100644
--- a/MaterialLib/Adsorption/DensityNunez.h
+++ b/MaterialLib/Adsorption/DensityNunez.h
@@ -23,4 +23,4 @@ public:
     double dCharacteristicCurve(const double A) const override;
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/Reaction.h b/MaterialLib/Adsorption/Reaction.h
index 0011b734a87..a220d3cda18 100644
--- a/MaterialLib/Adsorption/Reaction.h
+++ b/MaterialLib/Adsorption/Reaction.h
@@ -33,4 +33,4 @@ public:
     virtual ~Reaction() = default;
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/ReactionCaOH2.cpp b/MaterialLib/Adsorption/ReactionCaOH2.cpp
index 17af5d07793..fed12383bf0 100644
--- a/MaterialLib/Adsorption/ReactionCaOH2.cpp
+++ b/MaterialLib/Adsorption/ReactionCaOH2.cpp
@@ -133,4 +133,4 @@ double ReactionCaOH2::CaHydration()
     return dXdt;
 }
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/ReactionCaOH2.h b/MaterialLib/Adsorption/ReactionCaOH2.h
index aa1aea2b13a..645c00c0a62 100644
--- a/MaterialLib/Adsorption/ReactionCaOH2.h
+++ b/MaterialLib/Adsorption/ReactionCaOH2.h
@@ -84,4 +84,4 @@ public:
     static MATERIALLIB_EXPORT const double rho_up;  //! upper density limit
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/ReactionInert.h b/MaterialLib/Adsorption/ReactionInert.h
index fe2dc760803..2eaa2e9ccf2 100644
--- a/MaterialLib/Adsorption/ReactionInert.h
+++ b/MaterialLib/Adsorption/ReactionInert.h
@@ -32,4 +32,4 @@ public:
     }
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/ReactionSinusoidal.h b/MaterialLib/Adsorption/ReactionSinusoidal.h
index 4dc5b0dd5c2..e34864c6de6 100644
--- a/MaterialLib/Adsorption/ReactionSinusoidal.h
+++ b/MaterialLib/Adsorption/ReactionSinusoidal.h
@@ -44,4 +44,4 @@ private:
     double _enthalpy;
 };
 
-}
+}  // namespace Adsorption
diff --git a/MaterialLib/Fluid/ConstantFluidProperty.h b/MaterialLib/Fluid/ConstantFluidProperty.h
index 11afa7eef0b..87327aa5e5d 100644
--- a/MaterialLib/Fluid/ConstantFluidProperty.h
+++ b/MaterialLib/Fluid/ConstantFluidProperty.h
@@ -54,5 +54,5 @@ private:
     const double _value;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Density/CreateFluidDensityModel.cpp b/MaterialLib/Fluid/Density/CreateFluidDensityModel.cpp
index 959921e750d..cdd515217c3 100644
--- a/MaterialLib/Fluid/Density/CreateFluidDensityModel.cpp
+++ b/MaterialLib/Fluid/Density/CreateFluidDensityModel.cpp
@@ -167,5 +167,5 @@ std::unique_ptr<FluidProperty> createFluidDensityModel(
         type.data());
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Density/IdealGasLaw.h b/MaterialLib/Fluid/Density/IdealGasLaw.h
index e39cf29ef7f..5e6b29e5b06 100644
--- a/MaterialLib/Fluid/Density/IdealGasLaw.h
+++ b/MaterialLib/Fluid/Density/IdealGasLaw.h
@@ -87,5 +87,5 @@ private:
         return _molar_mass / (PhysicalConstant::IdealGasConstant * T);
     }
 };
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Density/LinearConcentrationDependentDensity.h b/MaterialLib/Fluid/Density/LinearConcentrationDependentDensity.h
index 8dd7693e8f9..c806eb97f5b 100644
--- a/MaterialLib/Fluid/Density/LinearConcentrationDependentDensity.h
+++ b/MaterialLib/Fluid/Density/LinearConcentrationDependentDensity.h
@@ -82,5 +82,5 @@ private:
     const double _fluid_density_difference_ratio;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Density/LinearTemperatureDependentDensity.h b/MaterialLib/Fluid/Density/LinearTemperatureDependentDensity.h
index dd0cc41b983..5bc2f9bf1a7 100644
--- a/MaterialLib/Fluid/Density/LinearTemperatureDependentDensity.h
+++ b/MaterialLib/Fluid/Density/LinearTemperatureDependentDensity.h
@@ -72,5 +72,5 @@ private:
     const double _beta;          ///<  Parameter.
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Density/LiquidDensity.h b/MaterialLib/Fluid/Density/LiquidDensity.h
index bc106fc3a3d..7b8395f33a4 100644
--- a/MaterialLib/Fluid/Density/LiquidDensity.h
+++ b/MaterialLib/Fluid/Density/LiquidDensity.h
@@ -138,5 +138,5 @@ private:
     }
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Density/WaterDensityIAPWSIF97Region1.h b/MaterialLib/Fluid/Density/WaterDensityIAPWSIF97Region1.h
index 7d1d4a65510..badae46d99f 100644
--- a/MaterialLib/Fluid/Density/WaterDensityIAPWSIF97Region1.h
+++ b/MaterialLib/Fluid/Density/WaterDensityIAPWSIF97Region1.h
@@ -90,5 +90,5 @@ private:
     const double _sR = 461.526;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/FluidProperties/CreateFluidProperties.cpp b/MaterialLib/Fluid/FluidProperties/CreateFluidProperties.cpp
index 8c511f53ce6..3fe6d034af4 100644
--- a/MaterialLib/Fluid/FluidProperties/CreateFluidProperties.cpp
+++ b/MaterialLib/Fluid/FluidProperties/CreateFluidProperties.cpp
@@ -89,5 +89,5 @@ std::unique_ptr<FluidProperties> createFluidProperties(
         std::move(specific_heat_capacity), std::move(thermal_conductivity));
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h b/MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h
index ba5f0189574..4ffc5026d47 100644
--- a/MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h
+++ b/MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h
@@ -29,4 +29,4 @@ class FluidProperties;
 std::unique_ptr<FluidProperties> createFluidProperties(
     BaseLib::ConfigTree const& config);
 }  // end namespace
-}  // end namespace
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/FluidProperties/FluidProperties.h b/MaterialLib/Fluid/FluidProperties/FluidProperties.h
index b70f8c13460..87c03eaac6f 100644
--- a/MaterialLib/Fluid/FluidProperties/FluidProperties.h
+++ b/MaterialLib/Fluid/FluidProperties/FluidProperties.h
@@ -94,5 +94,5 @@ protected:
         _property_models;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/FluidProperties/FluidPropertiesWithDensityDependentModels.cpp b/MaterialLib/Fluid/FluidProperties/FluidPropertiesWithDensityDependentModels.cpp
index 7fd1c30aef9..2a0a8167b67 100644
--- a/MaterialLib/Fluid/FluidProperties/FluidPropertiesWithDensityDependentModels.cpp
+++ b/MaterialLib/Fluid/FluidProperties/FluidPropertiesWithDensityDependentModels.cpp
@@ -123,5 +123,5 @@ double FluidPropertiesWithDensityDependentModels::compute_df_drho_drho_dp(
            drho_dp;
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/FluidProperties/FluidPropertiesWithDensityDependentModels.h b/MaterialLib/Fluid/FluidProperties/FluidPropertiesWithDensityDependentModels.h
index a4b41be650e..cf11057e72d 100644
--- a/MaterialLib/Fluid/FluidProperties/FluidPropertiesWithDensityDependentModels.h
+++ b/MaterialLib/Fluid/FluidProperties/FluidPropertiesWithDensityDependentModels.h
@@ -77,5 +77,5 @@ private:
     std::array<bool, FluidPropertyTypeNumber> _is_density_dependent;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/FluidProperties/PrimaryVariableDependentFluidProperties.h b/MaterialLib/Fluid/FluidProperties/PrimaryVariableDependentFluidProperties.h
index 030bb6dd344..48873035080 100644
--- a/MaterialLib/Fluid/FluidProperties/PrimaryVariableDependentFluidProperties.h
+++ b/MaterialLib/Fluid/FluidProperties/PrimaryVariableDependentFluidProperties.h
@@ -71,5 +71,5 @@ public:
     }
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/FluidProperty.h b/MaterialLib/Fluid/FluidProperty.h
index 68fec1a7543..e56c4d45252 100644
--- a/MaterialLib/Fluid/FluidProperty.h
+++ b/MaterialLib/Fluid/FluidProperty.h
@@ -45,5 +45,5 @@ public:
                              const PropertyVariableType /* var */) const = 0;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.cpp b/MaterialLib/Fluid/GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.cpp
index 359bec65174..756350c58d3 100644
--- a/MaterialLib/Fluid/GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.cpp
+++ b/MaterialLib/Fluid/GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.cpp
@@ -119,5 +119,5 @@ double DimensionLessGibbsFreeEnergyRegion1::get_dgamma_dtau_dpi(
     return val;
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.h b/MaterialLib/Fluid/GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.h
index 53bcc1754ca..9dd50f20feb 100644
--- a/MaterialLib/Fluid/GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.h
+++ b/MaterialLib/Fluid/GibbsFreeEnergy/DimensionLessGibbsFreeEnergyRegion1.h
@@ -94,5 +94,5 @@ public:
     double get_dgamma_dtau_dpi(const double tau, const double pi) const;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/PropertyVariableType.h b/MaterialLib/Fluid/PropertyVariableType.h
index 9b8d50fe4ce..28d430c71f7 100644
--- a/MaterialLib/Fluid/PropertyVariableType.h
+++ b/MaterialLib/Fluid/PropertyVariableType.h
@@ -29,5 +29,5 @@ enum class PropertyVariableType
 const unsigned PropertyVariableNumber =
     static_cast<unsigned>(PropertyVariableType::number_of_variables);
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.cpp b/MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.cpp
index 28087cb95c6..aa7982aa7c3 100644
--- a/MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.cpp
+++ b/MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.cpp
@@ -41,5 +41,5 @@ std::unique_ptr<FluidProperty> createSpecificFluidHeatCapacityModel(
         type.data());
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.h b/MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.h
index 048a6217e39..b037290f986 100644
--- a/MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.h
+++ b/MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.h
@@ -33,5 +33,5 @@ class FluidProperty;
 std::unique_ptr<FluidProperty> createSpecificFluidHeatCapacityModel(
     BaseLib::ConfigTree const& config);
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/ThermalConductivity/CreateFluidThermalConductivityModel.cpp b/MaterialLib/Fluid/ThermalConductivity/CreateFluidThermalConductivityModel.cpp
index 985dca5fdaf..ef984a45f9d 100644
--- a/MaterialLib/Fluid/ThermalConductivity/CreateFluidThermalConductivityModel.cpp
+++ b/MaterialLib/Fluid/ThermalConductivity/CreateFluidThermalConductivityModel.cpp
@@ -41,5 +41,5 @@ std::unique_ptr<FluidProperty> createFluidThermalConductivityModel(
         type.data());
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/ThermalConductivity/CreateFluidThermalConductivityModel.h b/MaterialLib/Fluid/ThermalConductivity/CreateFluidThermalConductivityModel.h
index 2139422a3bf..742248ba3c4 100644
--- a/MaterialLib/Fluid/ThermalConductivity/CreateFluidThermalConductivityModel.h
+++ b/MaterialLib/Fluid/ThermalConductivity/CreateFluidThermalConductivityModel.h
@@ -33,5 +33,5 @@ class FluidProperty;
 std::unique_ptr<FluidProperty> createFluidThermalConductivityModel(
     BaseLib::ConfigTree const& config);
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Viscosity/CreateViscosityModel.cpp b/MaterialLib/Fluid/Viscosity/CreateViscosityModel.cpp
index cfa855b347a..dfeb268d759 100644
--- a/MaterialLib/Fluid/Viscosity/CreateViscosityModel.cpp
+++ b/MaterialLib/Fluid/Viscosity/CreateViscosityModel.cpp
@@ -146,5 +146,5 @@ std::unique_ptr<FluidProperty> createViscosityModel(
         type.data());
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Viscosity/CreateViscosityModel.h b/MaterialLib/Fluid/Viscosity/CreateViscosityModel.h
index 4b9cc72c321..878f524ae36 100644
--- a/MaterialLib/Fluid/Viscosity/CreateViscosityModel.h
+++ b/MaterialLib/Fluid/Viscosity/CreateViscosityModel.h
@@ -29,4 +29,4 @@ std::unique_ptr<FluidProperty> createViscosityModel(
     BaseLib::ConfigTree const& config);
 
 }  // end namespace
-}  // end namespace
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Viscosity/LinearPressureDependentViscosity.h b/MaterialLib/Fluid/Viscosity/LinearPressureDependentViscosity.h
index eedeefefc12..7481c2acecc 100644
--- a/MaterialLib/Fluid/Viscosity/LinearPressureDependentViscosity.h
+++ b/MaterialLib/Fluid/Viscosity/LinearPressureDependentViscosity.h
@@ -82,5 +82,5 @@ private:
     const double _gamma;  ///<  Parameter.
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h b/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h
index 48386f10dc0..1ee3564dcba 100644
--- a/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h
+++ b/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h
@@ -91,5 +91,5 @@ private:
     const double _temperature_v;  ///<  Reference temperature 2.
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Viscosity/VogelsLiquidDynamicViscosity.h b/MaterialLib/Fluid/Viscosity/VogelsLiquidDynamicViscosity.h
index 0bf51cf16d6..b2c1ba88574 100644
--- a/MaterialLib/Fluid/Viscosity/VogelsLiquidDynamicViscosity.h
+++ b/MaterialLib/Fluid/Viscosity/VogelsLiquidDynamicViscosity.h
@@ -110,5 +110,5 @@ struct VogelsViscosityConstantsCH4
     const double C = 969.306;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp b/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp
index 6dfe681c5cf..21bd160a2d0 100644
--- a/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp
+++ b/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp
@@ -195,5 +195,5 @@ double computedBarMu_dbarRho(const double barT, double bar_rho)
            (mu1_factor + bar_rho * dmu1_factor_dbar_rho);
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.h b/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.h
index 950007cb960..80e7175fa79 100644
--- a/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.h
+++ b/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.h
@@ -82,5 +82,5 @@ private:
     // Coefficients Hi and Hij are given in two static arrays in the cpp file.
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/WaterVaporProperties/WaterVaporProperties.cpp b/MaterialLib/Fluid/WaterVaporProperties/WaterVaporProperties.cpp
index 0c53db4408f..d330cd104a0 100644
--- a/MaterialLib/Fluid/WaterVaporProperties/WaterVaporProperties.cpp
+++ b/MaterialLib/Fluid/WaterVaporProperties/WaterVaporProperties.cpp
@@ -83,5 +83,5 @@ double WaterVaporProperties::getWaterVaporEnthalpySimple(const double temperatur
         h_wg;
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/Fluid/WaterVaporProperties/WaterVaporProperties.h b/MaterialLib/Fluid/WaterVaporProperties/WaterVaporProperties.h
index fed0898b0d6..a43baa58492 100644
--- a/MaterialLib/Fluid/WaterVaporProperties/WaterVaporProperties.h
+++ b/MaterialLib/Fluid/WaterVaporProperties/WaterVaporProperties.h
@@ -62,5 +62,5 @@ private:
     const double& _air_mol_mass = PhysicalConstant::MolarMass::Air;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace Fluid
+}  // namespace MaterialLib
diff --git a/MaterialLib/FractureModels/MohrCoulomb.cpp b/MaterialLib/FractureModels/MohrCoulomb.cpp
index 6d569b05f58..c19c0fbb943 100644
--- a/MaterialLib/FractureModels/MohrCoulomb.cpp
+++ b/MaterialLib/FractureModels/MohrCoulomb.cpp
@@ -43,7 +43,7 @@ struct MaterialPropertyValues
     }
 };
 
-} // no namespace
+}  // namespace
 
 template <int DisplacementDim>
 void MohrCoulomb<DisplacementDim>::computeConstitutiveRelation(
diff --git a/MaterialLib/MPL/CreateComponent.cpp b/MaterialLib/MPL/CreateComponent.cpp
index 1364eb9c45c..c042afe9501 100644
--- a/MaterialLib/MPL/CreateComponent.cpp
+++ b/MaterialLib/MPL/CreateComponent.cpp
@@ -59,7 +59,7 @@ std::unique_ptr<MaterialPropertyLib::Component> createComponent(
 
     return std::make_unique<Component>(component_name, std::move(properties));
 }
-}
+}  // namespace
 
 namespace MaterialPropertyLib
 {
diff --git a/MaterialLib/MPL/CreatePhase.cpp b/MaterialLib/MPL/CreatePhase.cpp
index 8423aef4811..800de257b90 100644
--- a/MaterialLib/MPL/CreatePhase.cpp
+++ b/MaterialLib/MPL/CreatePhase.cpp
@@ -75,7 +75,7 @@ std::unique_ptr<MaterialPropertyLib::Phase> createPhase(
     return std::make_unique<Phase>(
         std::move(phase_type), std::move(components), std::move(properties));
 }
-}
+}  // namespace
 
 namespace MaterialPropertyLib
 {
diff --git a/MaterialLib/MPL/Properties/LinearProperty.h b/MaterialLib/MPL/Properties/LinearProperty.h
index 7ba5ebe49d3..61727a702d8 100644
--- a/MaterialLib/MPL/Properties/LinearProperty.h
+++ b/MaterialLib/MPL/Properties/LinearProperty.h
@@ -50,4 +50,4 @@ public:
 private:
     IndependentVariable const _independent_variable;
 };
-}
+}  // namespace MaterialPropertyLib
diff --git a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
index 1aaabb81533..b21edcd0237 100644
--- a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
+++ b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
@@ -107,5 +107,5 @@ PorousMediaProperties createPorousMediaProperties(
                                  std::move(storage_models), material_ids};
 }
 
-}  // namespace ComponentTransport
-}  // namespace ProcessLib
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Permeability/Permeability.h b/MaterialLib/PorousMedium/Permeability/Permeability.h
index b577bc64766..4716f0135d2 100644
--- a/MaterialLib/PorousMedium/Permeability/Permeability.h
+++ b/MaterialLib/PorousMedium/Permeability/Permeability.h
@@ -77,5 +77,5 @@ private:
     mutable Eigen::MatrixXd _intrinsic_permeability_tensor;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp
index 75226449378..a8a510efa8b 100644
--- a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp
+++ b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp
@@ -59,5 +59,5 @@ std::unique_ptr<Permeability> createPermeabilityModel(
               type.data());
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h
index c51bd827b8c..0237ebea93b 100644
--- a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h
+++ b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h
@@ -35,5 +35,5 @@ std::unique_ptr<Permeability> createPermeabilityModel(
     BaseLib::ConfigTree const& config,
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Porosity/Porosity.h b/MaterialLib/PorousMedium/Porosity/Porosity.h
index b6a8ce93f62..a4cca87dc1f 100644
--- a/MaterialLib/PorousMedium/Porosity/Porosity.h
+++ b/MaterialLib/PorousMedium/Porosity/Porosity.h
@@ -51,5 +51,5 @@ private:
     ProcessLib::Parameter<double> const& _parameter;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp b/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp
index 4fb36d2b127..de4cd5b11e8 100644
--- a/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp
+++ b/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp
@@ -44,5 +44,5 @@ std::unique_ptr<Porosity> createPorosityModel(BaseLib::ConfigTree const& config,
               type.data());
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Porosity/createPorosityModel.h b/MaterialLib/PorousMedium/Porosity/createPorosityModel.h
index 6c0444e8cfd..bdfb5602239 100644
--- a/MaterialLib/PorousMedium/Porosity/createPorosityModel.h
+++ b/MaterialLib/PorousMedium/Porosity/createPorosityModel.h
@@ -35,5 +35,5 @@ std::unique_ptr<Porosity> createPorosityModel(
     BaseLib::ConfigTree const& config,
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/PorousMediaProperties.cpp b/MaterialLib/PorousMedium/PorousMediaProperties.cpp
index fb03d81bf4f..6c05d86e96b 100644
--- a/MaterialLib/PorousMedium/PorousMediaProperties.cpp
+++ b/MaterialLib/PorousMedium/PorousMediaProperties.cpp
@@ -40,5 +40,5 @@ PorousMediaProperties::getSpecificStorage(
 {
     return *_specific_storage_models[getMaterialID(pos)];
 }
-}
-}
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/PorousMediaProperties.h b/MaterialLib/PorousMedium/PorousMediaProperties.h
index dc07be9200c..cc5965c6e8b 100644
--- a/MaterialLib/PorousMedium/PorousMediaProperties.h
+++ b/MaterialLib/PorousMedium/PorousMediaProperties.h
@@ -68,5 +68,5 @@ private:
     MeshLib::PropertyVector<int> const* const _material_ids;
 };
 
-}
-}
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Storage/ConstantStorage.h b/MaterialLib/PorousMedium/Storage/ConstantStorage.h
index bab1ee76511..b1dd4a89da1 100644
--- a/MaterialLib/PorousMedium/Storage/ConstantStorage.h
+++ b/MaterialLib/PorousMedium/Storage/ConstantStorage.h
@@ -40,5 +40,5 @@ private:
     const double _value;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Storage/Storage.h b/MaterialLib/PorousMedium/Storage/Storage.h
index b80c7554b31..67ab489b15e 100644
--- a/MaterialLib/PorousMedium/Storage/Storage.h
+++ b/MaterialLib/PorousMedium/Storage/Storage.h
@@ -32,5 +32,5 @@ public:
     virtual double getValue(const double variable) const = 0;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Storage/createStorageModel.cpp b/MaterialLib/PorousMedium/Storage/createStorageModel.cpp
index ef826f05bbf..0c553ec1ddc 100644
--- a/MaterialLib/PorousMedium/Storage/createStorageModel.cpp
+++ b/MaterialLib/PorousMedium/Storage/createStorageModel.cpp
@@ -36,5 +36,5 @@ std::unique_ptr<Storage> createStorageModel(BaseLib::ConfigTree const& config)
               "The available type is Constant.");
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Storage/createStorageModel.h b/MaterialLib/PorousMedium/Storage/createStorageModel.h
index 29c3b8c301a..827f96c6999 100644
--- a/MaterialLib/PorousMedium/Storage/createStorageModel.h
+++ b/MaterialLib/PorousMedium/Storage/createStorageModel.h
@@ -30,4 +30,4 @@ class Storage;
 std::unique_ptr<Storage> createStorageModel(BaseLib::ConfigTree const& config);
 
 }  // end namespace
-}  // end namespace
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/BrooksCoreyCapillaryPressureSaturation.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/BrooksCoreyCapillaryPressureSaturation.cpp
index 2645f5bedd0..c89cbd318c5 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/BrooksCoreyCapillaryPressureSaturation.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/BrooksCoreyCapillaryPressureSaturation.cpp
@@ -53,5 +53,5 @@ double BrooksCoreyCapillaryPressureSaturation::getdPcdS(
     return (_pb * val) / (_m * (_saturation_r - S));
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/BrooksCoreyCapillaryPressureSaturation.h b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/BrooksCoreyCapillaryPressureSaturation.h
index b4b5f0442b0..63e2d4ef552 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/BrooksCoreyCapillaryPressureSaturation.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/BrooksCoreyCapillaryPressureSaturation.h
@@ -87,5 +87,5 @@ private:
     const double _m;   ///< Exponent m, m>1.
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h
index 2a28ab6e0ce..1c3037c7254 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h
@@ -69,5 +69,5 @@ protected:
     const double _minor_offset = std::numeric_limits<double>::epsilon();
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturationCurve.h b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturationCurve.h
index b9929793fb6..7362a2b4e42 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturationCurve.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturationCurve.h
@@ -81,5 +81,5 @@ private:
     std::unique_ptr<MathLib::PiecewiseLinearMonotonicCurve> _curve_data;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp
index 0822e55c1e4..88b2ed18049 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp
@@ -163,5 +163,5 @@ std::unique_ptr<CapillaryPressureSaturation> createCapillaryPressureModel(
         type.data());
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.h b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.h
index 340d6a5a961..a69597503bc 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.h
@@ -29,4 +29,4 @@ class CapillaryPressureSaturation;
 std::unique_ptr<CapillaryPressureSaturation> createCapillaryPressureModel(
     BaseLib::ConfigTree const& config);
 }
-}  // end namespace
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/VanGenuchtenCapillaryPressureSaturation.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/VanGenuchtenCapillaryPressureSaturation.cpp
index d29857c1f9b..4e4177c387c 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/VanGenuchtenCapillaryPressureSaturation.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/VanGenuchtenCapillaryPressureSaturation.cpp
@@ -158,5 +158,5 @@ double VanGenuchtenCapillaryPressureSaturation::getdPcdSvG(
            std::pow(S_le, (-1 / _m)) / S_le;
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/VanGenuchtenCapillaryPressureSaturation.h b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/VanGenuchtenCapillaryPressureSaturation.h
index da948f38caa..a4310c96b0a 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/VanGenuchtenCapillaryPressureSaturation.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/VanGenuchtenCapillaryPressureSaturation.h
@@ -114,5 +114,5 @@ private:
     double getdPcdSvG(const double Sg) const;
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.cpp
index 0c1d6d4a257..4aff51cf35b 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.cpp
@@ -209,5 +209,5 @@ std::unique_ptr<RelativePermeability> createRelativePermeabilityModel(
         type.data());
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.h b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.h
index fdf30e87f69..8cef856c1b6 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.h
@@ -29,4 +29,4 @@ class RelativePermeability;
 std::unique_ptr<RelativePermeability> createRelativePermeabilityModel(
     BaseLib::ConfigTree const& config);
 }
-}  // end namespace
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.cpp
index 2e00900fea2..1f713447f74 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.cpp
@@ -47,5 +47,5 @@ double NonWettingPhaseBrooksCoreyOilGas::getdValue(
            (_saturation_max - _saturation_r);
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.h b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.h
index 92c1046ea05..3b495bbec78 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseBrooksCoreyOilGas.h
@@ -68,5 +68,5 @@ private:
     const double _krel_min;  ///< Minimum relative permeability
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseVanGenuchten.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseVanGenuchten.cpp
index 77d65ce200d..d14cd7aebab 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseVanGenuchten.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseVanGenuchten.cpp
@@ -46,5 +46,5 @@ double NonWettingPhaseVanGenuchten::getdValue(const double saturation_w) const
                 std::pow(Se, (1. - _m) / _m)) /
            (_saturation_max - _saturation_r);
 }
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseVanGenuchten.h b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseVanGenuchten.h
index 66fa666a1c7..87420a4c10f 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseVanGenuchten.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/NonWettingPhaseVanGenuchten.h
@@ -72,5 +72,5 @@ private:
     const double _krel_min;  ///< Minimum relative permeability
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeability.h b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeability.h
index 6d80afc09be..7ba94a9810d 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeability.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeability.h
@@ -51,5 +51,5 @@ protected:
     const double _saturation_max;  ///< Maximum saturation.
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeabilityCurve.h b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeabilityCurve.h
index f4a3727a238..d4676428ef4 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeabilityCurve.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/RelativePermeabilityCurve.h
@@ -63,5 +63,5 @@ public:
 private:
     std::unique_ptr<MathLib::PiecewiseLinearInterpolation> _curve_data;
 };
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseBrooksCoreyOilGas.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseBrooksCoreyOilGas.cpp
index 4ccebdb24cd..be11d692285 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseBrooksCoreyOilGas.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseBrooksCoreyOilGas.cpp
@@ -39,5 +39,5 @@ double WettingPhaseBrooksCoreyOilGas::getdValue(const double saturation) const
     return ((3.0 + 2.0 / _m) * std::pow(Se, 2.0 + 2.0 / _m)) /
            (_saturation_max - _saturation_r);
 }
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseBrooksCoreyOilGas.h b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseBrooksCoreyOilGas.h
index de81cc669dd..4fb7003dee3 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseBrooksCoreyOilGas.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseBrooksCoreyOilGas.h
@@ -64,5 +64,5 @@ private:
     const double _krel_min;  ///< Minimum relative permeability
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseVanGenuchten.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseVanGenuchten.cpp
index 8ee6e83e781..aafcb00532b 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseVanGenuchten.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseVanGenuchten.cpp
@@ -48,5 +48,5 @@ double WettingPhaseVanGenuchten::getdValue(const double saturation) const
            (_saturation_max - _saturation_r);
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseVanGenuchten.h b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseVanGenuchten.h
index ef27881417a..ee47217360a 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseVanGenuchten.h
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/WettingPhaseVanGenuchten.h
@@ -67,5 +67,5 @@ private:
     const double _krel_min;  ///< Minimum relative permeability
 };
 
-}  // end namespace
-}  // end namespace
+}  // namespace PorousMedium
+}  // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp b/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
index cf24b3b0d03..5eed2b314b2 100644
--- a/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
+++ b/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
@@ -119,5 +119,5 @@ template std::map<int, std::unique_ptr<MaterialLib::Solids::MechanicsBase<3>>>
 createConstitutiveRelations<3>(
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
     BaseLib::ConfigTree const& config);
-}
-}
+}  // namespace Solids
+}  // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/CreateConstitutiveRelation.h b/MaterialLib/SolidModels/CreateConstitutiveRelation.h
index 50310391425..9136a944b84 100644
--- a/MaterialLib/SolidModels/CreateConstitutiveRelation.h
+++ b/MaterialLib/SolidModels/CreateConstitutiveRelation.h
@@ -50,5 +50,5 @@ extern template std::map<int,
 createConstitutiveRelations<3>(
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
     BaseLib::ConfigTree const& config);
-}
-}
+}  // namespace Solids
+}  // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/CreateCreepBGRa.h b/MaterialLib/SolidModels/CreateCreepBGRa.h
index f5adefbc830..23b4c770c82 100644
--- a/MaterialLib/SolidModels/CreateCreepBGRa.h
+++ b/MaterialLib/SolidModels/CreateCreepBGRa.h
@@ -48,6 +48,6 @@ extern template std::unique_ptr<MaterialLib::Solids::MechanicsBase<3>>
 createCreepBGRa<3>(
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
     BaseLib::ConfigTree const& config);
-}
-}
-}
+}  // namespace Creep
+}  // namespace Solids
+}  // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.cpp b/MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.cpp
index 6b5cab0d1aa..72f83be098f 100644
--- a/MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.cpp
+++ b/MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.cpp
@@ -40,4 +40,4 @@ NumLib::NewtonRaphsonSolverParameters createNewtonRaphsonSolverParameters(
 
     return {maximum_iterations, error_tolerance};
 }
-}
+}  // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/Lubby2.h b/MaterialLib/SolidModels/Lubby2.h
index cc7c527e93e..58a0ebe5832 100644
--- a/MaterialLib/SolidModels/Lubby2.h
+++ b/MaterialLib/SolidModels/Lubby2.h
@@ -98,7 +98,7 @@ struct LocalLubby2Properties
     double etaK;
     double etaM;
 };
-}
+}  // namespace detail
 
 template <int DisplacementDim>
 class Lubby2 final : public MechanicsBase<DisplacementDim>
diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
index 3d77bc224ab..891ff1653dd 100644
--- a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
+++ b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
@@ -140,5 +140,5 @@ createTwoPhaseFlowMaterialProperties(
         std::move(fluid_config));
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace MaterialLib
diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
index a61e3ac218a..021ac92e594 100644
--- a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
+++ b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
@@ -35,4 +35,4 @@ createTwoPhaseFlowMaterialProperties(
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
 
 }  // end namespace
-}  // end namespace
+}  // namespace MaterialLib
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
index 97e68662b16..f8a9b5a2d99 100644
--- a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
@@ -182,5 +182,5 @@ double TwoPhaseFlowWithPPMaterialProperties::getWetRelativePermeability(
         return 1.0;
     return boost::math::pow<3>(saturation);
 }
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace MaterialLib
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
index 4156a649fa7..4adb66bad51 100644
--- a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
+++ b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
@@ -138,5 +138,5 @@ private:
         _relative_permeability_models;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace MaterialLib
diff --git a/MathLib/Curve/CreatePiecewiseLinearCurve-impl.h b/MathLib/Curve/CreatePiecewiseLinearCurve-impl.h
index cd81af627cd..8213360c91d 100644
--- a/MathLib/Curve/CreatePiecewiseLinearCurve-impl.h
+++ b/MathLib/Curve/CreatePiecewiseLinearCurve-impl.h
@@ -40,4 +40,4 @@ std::unique_ptr<CurveType> createPiecewiseLinearCurve(
     }
     return std::make_unique<CurveType>(std::move(x), std::move(y));
 }
-}
+}  // namespace MathLib
diff --git a/MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp b/MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp
index 48d829367ab..a6e9de4af8f 100644
--- a/MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp
+++ b/MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp
@@ -93,4 +93,4 @@ double PiecewiseLinearMonotonicCurve::getInverseVariable(const double y) const
     return m * (y - yi) + xi;
 }
 
-}  // namespace
+}  // namespace MathLib
diff --git a/MathLib/Curve/PiecewiseLinearMonotonicCurve.h b/MathLib/Curve/PiecewiseLinearMonotonicCurve.h
index 283a0b84c60..2b2d76a0e6f 100644
--- a/MathLib/Curve/PiecewiseLinearMonotonicCurve.h
+++ b/MathLib/Curve/PiecewiseLinearMonotonicCurve.h
@@ -44,4 +44,4 @@ private:
      */
     bool isStrongMonotonic() const;
 };
-}  // namespace
+}  // namespace MathLib
diff --git a/MathLib/Integration/GaussLegendrePyramid.cpp b/MathLib/Integration/GaussLegendrePyramid.cpp
index 07556c3748d..ce2f4b448f7 100644
--- a/MathLib/Integration/GaussLegendrePyramid.cpp
+++ b/MathLib/Integration/GaussLegendrePyramid.cpp
@@ -57,4 +57,4 @@ double const GaussLegendrePyramid<3>::W[13] = {
                                            0.419515737191525950
                                            };
 
-}
+}  // namespace MathLib
diff --git a/MathLib/Integration/GaussLegendrePyramid.h b/MathLib/Integration/GaussLegendrePyramid.h
index 217fdd6ac0b..e417c84bdfc 100644
--- a/MathLib/Integration/GaussLegendrePyramid.h
+++ b/MathLib/Integration/GaussLegendrePyramid.h
@@ -51,4 +51,4 @@ const std::array<std::array<double, 3>, GaussLegendrePyramid<1>::NPoints>
 template <>
 double const GaussLegendrePyramid<1>::W[1];
 #endif
-}
+}  // namespace MathLib
diff --git a/MathLib/Integration/GaussLegendreTet.cpp b/MathLib/Integration/GaussLegendreTet.cpp
index 24fdbbb9817..a1d751d8540 100644
--- a/MathLib/Integration/GaussLegendreTet.cpp
+++ b/MathLib/Integration/GaussLegendreTet.cpp
@@ -63,4 +63,4 @@ static const double r = 0.0425460207770812 / 6.;
 
 double const GaussLegendreTet<3>::W[GaussLegendreTet<3>::NPoints] = {
     p, p, p, p, q, q, q, q, r, r, r, r, r, r};
-}
+}  // namespace MathLib
diff --git a/MathLib/Integration/GaussLegendreTet.h b/MathLib/Integration/GaussLegendreTet.h
index 51249dcf5da..a30a8f7002e 100644
--- a/MathLib/Integration/GaussLegendreTet.h
+++ b/MathLib/Integration/GaussLegendreTet.h
@@ -51,4 +51,4 @@ const std::array<std::array<double, 3>, GaussLegendreTet<1>::NPoints>
 template <>
 double const GaussLegendreTet<1>::W[1];
 #endif
-}
+}  // namespace MathLib
diff --git a/MathLib/Integration/GaussLegendreTri.cpp b/MathLib/Integration/GaussLegendreTri.cpp
index 94852059093..eb2bcef70b0 100644
--- a/MathLib/Integration/GaussLegendreTri.cpp
+++ b/MathLib/Integration/GaussLegendreTri.cpp
@@ -26,4 +26,4 @@ double const GaussLegendreTri<2>::W[3] = {1./3., 1./3., 1./3.};
 const std::array<std::array<double, 2>, GaussLegendreTri<3>::NPoints> GaussLegendreTri<3>::X = {{{{1./3., 1./3.}}, {{1./5., 3./5.}}, {{1./5., 1./5.}}, {{3./5., 1./5.}}}};
 double const GaussLegendreTri<3>::W[4] = {-27./48., 25./48., 25./48., 25./48.};
 
-}
+}  // namespace MathLib
diff --git a/MathLib/Integration/GaussLegendreTri.h b/MathLib/Integration/GaussLegendreTri.h
index c2018a715ce..0a47bccdc87 100644
--- a/MathLib/Integration/GaussLegendreTri.h
+++ b/MathLib/Integration/GaussLegendreTri.h
@@ -56,4 +56,4 @@ const std::array<std::array<double, 2>, GaussLegendreTri<1>::NPoints>
 template <>
 double const GaussLegendreTri<1>::W[1];
 #endif
-}
+}  // namespace MathLib
diff --git a/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp b/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
index 1b34ae67606..c89daa34824 100644
--- a/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
+++ b/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
@@ -131,4 +131,4 @@ double PiecewiseLinearInterpolation::getSupportMin() const
     assert(!_supp_pnts.empty());
     return _supp_pnts.front();
 }
-}  // end MathLib
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
index 935f47656e3..fb00cd50868 100644
--- a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
+++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
@@ -171,7 +171,7 @@ std::unique_ptr<EigenLinearSolverBase> createIterativeSolver(
     }
 }
 
-} // details
+}  // namespace details
 
 EigenLinearSolver::EigenLinearSolver(
                             const std::string& /*solver_name*/,
@@ -285,4 +285,4 @@ bool EigenLinearSolver::solve(EigenMatrix &A, EigenVector& b, EigenVector &x)
     return success;
 }
 
-} //MathLib
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.h b/MathLib/LinAlg/Eigen/EigenLinearSolver.h
index 65aaee9879a..834b37dcc8a 100644
--- a/MathLib/LinAlg/Eigen/EigenLinearSolver.h
+++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.h
@@ -60,4 +60,4 @@ protected:
     std::unique_ptr<EigenLinearSolverBase> _solver;
 };
 
-} // MathLib
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/Eigen/EigenMapTools.h b/MathLib/LinAlg/Eigen/EigenMapTools.h
index af82b6fdd4c..b4efa62f24c 100644
--- a/MathLib/LinAlg/Eigen/EigenMapTools.h
+++ b/MathLib/LinAlg/Eigen/EigenMapTools.h
@@ -209,4 +209,4 @@ inline Eigen::Map<Eigen::VectorXd> toVector(
     return {data.data(), static_cast<Eigen::VectorXd::Index>(data.size())};
 }
 
-}  // MathLib
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/Eigen/EigenOption.cpp b/MathLib/LinAlg/Eigen/EigenOption.cpp
index 47a8c46c81f..c509cf4684d 100644
--- a/MathLib/LinAlg/Eigen/EigenOption.cpp
+++ b/MathLib/LinAlg/Eigen/EigenOption.cpp
@@ -82,4 +82,4 @@ std::string EigenOption::getPreconName(PreconType const precon_type)
     return "Invalid";
 }
 
-} //MathLib
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/Eigen/EigenOption.h b/MathLib/LinAlg/Eigen/EigenOption.h
index f3cf3974676..aab3884ad51 100644
--- a/MathLib/LinAlg/Eigen/EigenOption.h
+++ b/MathLib/LinAlg/Eigen/EigenOption.h
@@ -79,4 +79,4 @@ struct EigenOption final
 
 };
 
-}
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/Eigen/EigenTools.cpp b/MathLib/LinAlg/Eigen/EigenTools.cpp
index dd60c3efda7..58e08c7bf77 100644
--- a/MathLib/LinAlg/Eigen/EigenTools.cpp
+++ b/MathLib/LinAlg/Eigen/EigenTools.cpp
@@ -62,7 +62,4 @@ void applyKnownSolution(EigenMatrix &A_, EigenVector &b_, EigenVector &/*x*/,
     A = AT.transpose();
 }
 
-} // MathLib
-
-
-
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/Eigen/EigenTools.h b/MathLib/LinAlg/Eigen/EigenTools.h
index 198d78559a4..85194e70eb6 100644
--- a/MathLib/LinAlg/Eigen/EigenTools.h
+++ b/MathLib/LinAlg/Eigen/EigenTools.h
@@ -44,4 +44,4 @@ void applyKnownSolution(Eigen::MatrixXd &A, Eigen::VectorXd &b, Eigen::VectorXd
     OGS_FATAL("Method not implemented."); // TODO implement
 }
 
-} // MathLib
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/Eigen/EigenVector.h b/MathLib/LinAlg/Eigen/EigenVector.h
index 065c60bbd4b..906592a6cb1 100644
--- a/MathLib/LinAlg/Eigen/EigenVector.h
+++ b/MathLib/LinAlg/Eigen/EigenVector.h
@@ -121,4 +121,4 @@ private:
     RawVectorType _vec;
 };
 
-} // MathLib
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/LinAlg.h b/MathLib/LinAlg/LinAlg.h
index 129374da086..cb777773b59 100644
--- a/MathLib/LinAlg/LinAlg.h
+++ b/MathLib/LinAlg/LinAlg.h
@@ -129,8 +129,8 @@ void matMultAdd(Matrix const& A, Vector const& v1, Vector const& v2, Vector& v3)
     v3 = v2 + A*v1;
 }
 
-}} // namespaces
-
+}  // namespace LinAlg
+}  // namespace MathLib
 
 // Global PETScMatrix/PETScVector //////////////////////////////////////////
 #ifdef USE_PETSC
diff --git a/MathLib/LinAlg/LinearSolverOptions.cpp b/MathLib/LinAlg/LinearSolverOptions.cpp
index e15dd3357d4..0f5a5158472 100644
--- a/MathLib/LinAlg/LinearSolverOptions.cpp
+++ b/MathLib/LinAlg/LinearSolverOptions.cpp
@@ -22,4 +22,4 @@ ignoreOtherLinearSolvers(const BaseLib::ConfigTree &config,
     }
 }
 
-}
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/LinearSolverOptions.h b/MathLib/LinAlg/LinearSolverOptions.h
index 27e0b50ea78..75557a0ba1e 100644
--- a/MathLib/LinAlg/LinearSolverOptions.h
+++ b/MathLib/LinAlg/LinearSolverOptions.h
@@ -35,4 +35,4 @@ namespace MathLib
 void ignoreOtherLinearSolvers(BaseLib::ConfigTree const& config,
                               std::string const& solver_name);
 
-}
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/RowColumnIndices.h b/MathLib/LinAlg/RowColumnIndices.h
index 0fdb3ebe5b3..7141ee25cea 100644
--- a/MathLib/LinAlg/RowColumnIndices.h
+++ b/MathLib/LinAlg/RowColumnIndices.h
@@ -26,4 +26,4 @@ struct RowColumnIndices
     LineIndex const& columns;
 };
 
-} // MathLib
+}  // namespace MathLib
diff --git a/MathLib/LinAlg/SetMatrixSparsity.h b/MathLib/LinAlg/SetMatrixSparsity.h
index 23d4376dac4..3013e9d1c2a 100644
--- a/MathLib/LinAlg/SetMatrixSparsity.h
+++ b/MathLib/LinAlg/SetMatrixSparsity.h
@@ -31,7 +31,7 @@ void setMatrixSparsity(MATRIX& matrix, SPARSITY_PATTERN const& sparsity_pattern)
     set_sparsity(matrix, sparsity_pattern);
 }
 
-} // MathLib
+}  // namespace MathLib
 
 #ifdef USE_LIS
 #include "Lis/LisMatrix.h"
diff --git a/MathLib/LinearFunction.h b/MathLib/LinearFunction.h
index d004c1bff0d..47285852720 100644
--- a/MathLib/LinearFunction.h
+++ b/MathLib/LinearFunction.h
@@ -55,4 +55,4 @@ private:
     const std::array<T_TYPE, N_VARS+1> _coefficients;
 };
 
-} // MathLib
+}  // namespace MathLib
diff --git a/MathLib/MathTools.cpp b/MathLib/MathTools.cpp
index f648c8d0ddf..f26f016694a 100644
--- a/MathLib/MathTools.cpp
+++ b/MathLib/MathTools.cpp
@@ -43,6 +43,4 @@ double getAngle (const double p0[3], const double p1[3], const double p2[3])
     return std::acos (scalarProduct<double,3> (v0,v1) / (std::sqrt(scalarProduct<double,3>(v0,v0)) * sqrt(scalarProduct<double,3>(v1,v1))));
 }
 
-
-
-} // namespace
+}  // namespace MathLib
diff --git a/MathLib/MathTools.h b/MathLib/MathTools.h
index 0be695079ff..623f2984e8b 100644
--- a/MathLib/MathTools.h
+++ b/MathLib/MathTools.h
@@ -105,4 +105,4 @@ template<typename Type> Type limitValueInInterval(const Type variable,
         return upper_bound;
     return variable;
 }
-} // namespace
+}  // namespace MathLib
diff --git a/MathLib/Nonlinear/Root1D.h b/MathLib/Nonlinear/Root1D.h
index 728cb75a7fe..7da425ff2f7 100644
--- a/MathLib/Nonlinear/Root1D.h
+++ b/MathLib/Nonlinear/Root1D.h
@@ -38,8 +38,7 @@ inline bool almost_zero(double a)
     return std::abs(a) <= std::numeric_limits<double>::epsilon();
 }
 
-}
-
+}  // namespace detail
 
 //! Use the regula falsi method to find the root of some scalar function of one
 //! variable.
@@ -159,6 +158,6 @@ struct AndersonBjorck
     }
 };
 
-}
+}  // namespace Nonlinear
 
 } // namespace MathLib
diff --git a/MathLib/Point3dWithID.h b/MathLib/Point3dWithID.h
index ffd5e019997..87f8fe8a99e 100644
--- a/MathLib/Point3dWithID.h
+++ b/MathLib/Point3dWithID.h
@@ -66,4 +66,4 @@ protected:
     std::size_t _id;
 };
 
-}
+}  // namespace MathLib
diff --git a/MathLib/Vector3.h b/MathLib/Vector3.h
index f07e06ffa4b..aedfa326602 100644
--- a/MathLib/Vector3.h
+++ b/MathLib/Vector3.h
@@ -191,4 +191,4 @@ using Vector3 = TemplateVector3<double>;
 double scalarTriple(MathLib::Vector3 const& u, MathLib::Vector3 const& v,
                     MathLib::Vector3 const& w);
 
-}
+}  // namespace MathLib
diff --git a/MeshGeoToolsLib/AppendLinesAlongPolyline.cpp b/MeshGeoToolsLib/AppendLinesAlongPolyline.cpp
index 324caa7a5af..7b71d284bea 100644
--- a/MeshGeoToolsLib/AppendLinesAlongPolyline.cpp
+++ b/MeshGeoToolsLib/AppendLinesAlongPolyline.cpp
@@ -93,5 +93,4 @@ std::unique_ptr<MeshLib::Mesh> appendLinesAlongPolylines(
     return new_mesh;
 }
 
-} // MeshGeoToolsLib
-
+}  // namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/AppendLinesAlongPolyline.h b/MeshGeoToolsLib/AppendLinesAlongPolyline.h
index 569a60e4444..43ca120eae7 100644
--- a/MeshGeoToolsLib/AppendLinesAlongPolyline.h
+++ b/MeshGeoToolsLib/AppendLinesAlongPolyline.h
@@ -40,4 +40,4 @@ namespace MeshGeoToolsLib
  */
 std::unique_ptr<MeshLib::Mesh> appendLinesAlongPolylines(
     const MeshLib::Mesh& mesh, const GeoLib::PolylineVec& ply_vec);
-}
+}  // namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/BoundaryElementsAtPoint.cpp b/MeshGeoToolsLib/BoundaryElementsAtPoint.cpp
index 28738f42b30..588219f3ea1 100644
--- a/MeshGeoToolsLib/BoundaryElementsAtPoint.cpp
+++ b/MeshGeoToolsLib/BoundaryElementsAtPoint.cpp
@@ -48,4 +48,4 @@ BoundaryElementsAtPoint::~BoundaryElementsAtPoint()
     for (auto p : _boundary_elements)
         delete p;
 }
-}  // MeshGeoToolsLib
+}  // namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h b/MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h
index cd0108fe87d..9d8e36723ff 100644
--- a/MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h
+++ b/MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h
@@ -84,4 +84,4 @@ void resetMeshElementProperty(MeshLib::Mesh& mesh,
     }
 }
 
-}  // end namespace
+}  // namespace MeshGeoToolsLib
diff --git a/MeshLib/CoordinateSystem.cpp b/MeshLib/CoordinateSystem.cpp
index 5747dfa8c08..c018788fb27 100644
--- a/MeshLib/CoordinateSystem.cpp
+++ b/MeshLib/CoordinateSystem.cpp
@@ -49,4 +49,4 @@ unsigned char CoordinateSystem::getCoordinateSystem(const GeoLib::AABB &bbox) co
     return coords;
 }
 
-} // end
+}  // namespace MeshLib
diff --git a/MeshLib/CoordinateSystem.h b/MeshLib/CoordinateSystem.h
index 289c500f702..e02e4f37679 100644
--- a/MeshLib/CoordinateSystem.h
+++ b/MeshLib/CoordinateSystem.h
@@ -76,4 +76,4 @@ private:
     unsigned char _type;
 };
 
-} // MeshLib
+}  // namespace MeshLib
diff --git a/MeshLib/ElementCoordinatesMappingLocal.cpp b/MeshLib/ElementCoordinatesMappingLocal.cpp
index 7044317130b..bd98db7fdd2 100644
--- a/MeshLib/ElementCoordinatesMappingLocal.cpp
+++ b/MeshLib/ElementCoordinatesMappingLocal.cpp
@@ -87,4 +87,4 @@ ElementCoordinatesMappingLocal::ElementCoordinatesMappingLocal(
     detail::rotateToLocal(_matR2global.transpose(), _points);
 }
 
-} // MeshLib
+}  // namespace MeshLib
diff --git a/MeshLib/ElementCoordinatesMappingLocal.h b/MeshLib/ElementCoordinatesMappingLocal.h
index 3416396b8f3..24aab080d9e 100644
--- a/MeshLib/ElementCoordinatesMappingLocal.h
+++ b/MeshLib/ElementCoordinatesMappingLocal.h
@@ -52,4 +52,4 @@ private:
     RotationMatrix _matR2global;
 };
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/ElementStatus.cpp b/MeshLib/ElementStatus.cpp
index 2933c1216db..0b56d5661a8 100644
--- a/MeshLib/ElementStatus.cpp
+++ b/MeshLib/ElementStatus.cpp
@@ -132,4 +132,4 @@ bool ElementStatus::isActiveNode(MeshLib::Node const* node) const
     return _active_nodes[node->getID()]>0;
 }
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/ElementStatus.h b/MeshLib/ElementStatus.h
index 16d0ca03bac..d03007cd6a2 100644
--- a/MeshLib/ElementStatus.h
+++ b/MeshLib/ElementStatus.h
@@ -71,4 +71,4 @@ protected:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/CellRule.cpp b/MeshLib/Elements/CellRule.cpp
index d87b278410f..3b617588fb6 100644
--- a/MeshLib/Elements/CellRule.cpp
+++ b/MeshLib/Elements/CellRule.cpp
@@ -37,4 +37,4 @@ bool CellRule::testElementNodeOrder(const Element* e)
     return true;
 }
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/CellRule.h b/MeshLib/Elements/CellRule.h
index 106ea8f5b25..3f3f3f1673a 100644
--- a/MeshLib/Elements/CellRule.h
+++ b/MeshLib/Elements/CellRule.h
@@ -31,4 +31,4 @@ public:
     static bool testElementNodeOrder(const Element* /*e*/);
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/EdgeReturn.cpp b/MeshLib/Elements/EdgeReturn.cpp
index aa1fa698d84..af522280d5b 100644
--- a/MeshLib/Elements/EdgeReturn.cpp
+++ b/MeshLib/Elements/EdgeReturn.cpp
@@ -45,5 +45,4 @@ const Element* QuadraticEdgeReturn::getEdge(const Element* e, unsigned i)
     return nullptr;
 }
 
-} // end MeshLib
-
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/EdgeReturn.h b/MeshLib/Elements/EdgeReturn.h
index e647750710a..794fbfe854b 100644
--- a/MeshLib/Elements/EdgeReturn.h
+++ b/MeshLib/Elements/EdgeReturn.h
@@ -41,4 +41,4 @@ public:
     static const Element* getEdge(const Element* e, unsigned i);
 };
 
-} // end MeshLib
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/EdgeRule.h b/MeshLib/Elements/EdgeRule.h
index 601d49c0fc9..deea3585230 100644
--- a/MeshLib/Elements/EdgeRule.h
+++ b/MeshLib/Elements/EdgeRule.h
@@ -37,4 +37,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index 5c9061bee49..bf911e8f23e 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -239,4 +239,4 @@ bool isPointInElementXY(MathLib::Point3d const& p, Element const& e)
          MeshLib::MeshElemType2String(e.getGeomType()).c_str());
     return false;
 }
-}
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index e6ffd9b6b43..f9a5c02f39c 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -230,4 +230,4 @@ protected:
 /// @return true if the \f$p' \in e'\f$ and false if \f$p' \notin e'\f$
 bool isPointInElementXY(MathLib::Point3d const& p, Element const& e);
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/FaceRule.cpp b/MeshLib/Elements/FaceRule.cpp
index 4b4e7073a25..169f4020a42 100644
--- a/MeshLib/Elements/FaceRule.cpp
+++ b/MeshLib/Elements/FaceRule.cpp
@@ -39,5 +39,4 @@ MathLib::Vector3 FaceRule::getSurfaceNormal(const Element* e)
     return MathLib::crossProduct(u, v);
 }
 
-} /* namespace */
-
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/FaceRule.h b/MeshLib/Elements/FaceRule.h
index 3f3e9477a73..ee1d42768c0 100644
--- a/MeshLib/Elements/FaceRule.h
+++ b/MeshLib/Elements/FaceRule.h
@@ -44,4 +44,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/HexRule20.h b/MeshLib/Elements/HexRule20.h
index e9e47efa1da..7e8b89fc041 100644
--- a/MeshLib/Elements/HexRule20.h
+++ b/MeshLib/Elements/HexRule20.h
@@ -65,4 +65,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/HexRule8.h b/MeshLib/Elements/HexRule8.h
index 5bc4b57bb61..ebf9de650b2 100644
--- a/MeshLib/Elements/HexRule8.h
+++ b/MeshLib/Elements/HexRule8.h
@@ -98,4 +98,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/LineRule2.h b/MeshLib/Elements/LineRule2.h
index 44037e34c0a..d5576eaf76b 100644
--- a/MeshLib/Elements/LineRule2.h
+++ b/MeshLib/Elements/LineRule2.h
@@ -67,4 +67,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/LineRule3.h b/MeshLib/Elements/LineRule3.h
index 02b8f2a8885..0e961526d29 100644
--- a/MeshLib/Elements/LineRule3.h
+++ b/MeshLib/Elements/LineRule3.h
@@ -37,4 +37,4 @@ public:
     using EdgeReturn = MeshLib::QuadraticEdgeReturn;
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/MapBulkElementPoint.cpp b/MeshLib/Elements/MapBulkElementPoint.cpp
index edb024cf742..d487f3e5068 100644
--- a/MeshLib/Elements/MapBulkElementPoint.cpp
+++ b/MeshLib/Elements/MapBulkElementPoint.cpp
@@ -128,4 +128,4 @@ MathLib::Point3d getBulkElementPoint(MeshLib::Mesh const& /*mesh*/,
 {
     return MathLib::ORIGIN;
 }
-}  // end namespace ProcessLib
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/MapBulkElementPoint.h b/MeshLib/Elements/MapBulkElementPoint.h
index 7ef88153aa2..73bb897200b 100644
--- a/MeshLib/Elements/MapBulkElementPoint.h
+++ b/MeshLib/Elements/MapBulkElementPoint.h
@@ -63,4 +63,4 @@ MathLib::Point3d getBulkElementPoint(MeshLib::Mesh const& mesh,
                                      std::size_t bulk_element_id,
                                      std::size_t bulk_face_id,
                                      MathLib::WeightedPoint3D const& wp);
-}  // end namespace ProcessLib
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/PointRule1.h b/MeshLib/Elements/PointRule1.h
index b92a6b0bc74..6f4713efcc1 100644
--- a/MeshLib/Elements/PointRule1.h
+++ b/MeshLib/Elements/PointRule1.h
@@ -60,4 +60,4 @@ public:
     /// Calculates the length of a line
     static double computeVolume(Node const* const* _nodes);
 };
-}
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/PrismRule15.h b/MeshLib/Elements/PrismRule15.h
index b570c683d46..22569761d3a 100644
--- a/MeshLib/Elements/PrismRule15.h
+++ b/MeshLib/Elements/PrismRule15.h
@@ -66,4 +66,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/PrismRule6.h b/MeshLib/Elements/PrismRule6.h
index f9452b30001..5e93fa003f4 100644
--- a/MeshLib/Elements/PrismRule6.h
+++ b/MeshLib/Elements/PrismRule6.h
@@ -99,4 +99,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/PyramidRule13.h b/MeshLib/Elements/PyramidRule13.h
index 62ca8011590..dffea470b05 100644
--- a/MeshLib/Elements/PyramidRule13.h
+++ b/MeshLib/Elements/PyramidRule13.h
@@ -65,4 +65,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/PyramidRule5.h b/MeshLib/Elements/PyramidRule5.h
index f89a6e31223..bdf2c0f9412 100644
--- a/MeshLib/Elements/PyramidRule5.h
+++ b/MeshLib/Elements/PyramidRule5.h
@@ -98,4 +98,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/QuadRule4.h b/MeshLib/Elements/QuadRule4.h
index 324d89cb6c8..8a78c7a62ab 100644
--- a/MeshLib/Elements/QuadRule4.h
+++ b/MeshLib/Elements/QuadRule4.h
@@ -80,4 +80,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/QuadRule8.h b/MeshLib/Elements/QuadRule8.h
index 54e125e344f..ce7f906198c 100644
--- a/MeshLib/Elements/QuadRule8.h
+++ b/MeshLib/Elements/QuadRule8.h
@@ -49,4 +49,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/QuadRule9.h b/MeshLib/Elements/QuadRule9.h
index cf04c23cc5a..ebb77c29122 100644
--- a/MeshLib/Elements/QuadRule9.h
+++ b/MeshLib/Elements/QuadRule9.h
@@ -41,4 +41,4 @@ public:
     static const CellType cell_type = CellType::QUAD9;
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/TemplateElement-impl.h b/MeshLib/Elements/TemplateElement-impl.h
index a461bdea23b..7f3cc733adf 100644
--- a/MeshLib/Elements/TemplateElement-impl.h
+++ b/MeshLib/Elements/TemplateElement-impl.h
@@ -79,6 +79,4 @@ bool TemplateElement<ELEMENT_RULE>::isEdge(unsigned idx1, unsigned idx2) const
     return false;
 }
 
-
-} // MeshLib
-
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/TemplateElement.h b/MeshLib/Elements/TemplateElement.h
index f69de977b48..c4e2783e3db 100644
--- a/MeshLib/Elements/TemplateElement.h
+++ b/MeshLib/Elements/TemplateElement.h
@@ -159,6 +159,6 @@ public:
 
 };
 
-} // MeshLib
+}  // namespace MeshLib
 
 #include "TemplateElement-impl.h"
diff --git a/MeshLib/Elements/TetRule10.h b/MeshLib/Elements/TetRule10.h
index 6fad37db15f..47cb951e1d3 100644
--- a/MeshLib/Elements/TetRule10.h
+++ b/MeshLib/Elements/TetRule10.h
@@ -60,4 +60,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/TetRule4.h b/MeshLib/Elements/TetRule4.h
index f44241b1a8e..76ac9ac5930 100644
--- a/MeshLib/Elements/TetRule4.h
+++ b/MeshLib/Elements/TetRule4.h
@@ -93,4 +93,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/TriRule3.h b/MeshLib/Elements/TriRule3.h
index 7e7e1e86f78..67178beb3ac 100644
--- a/MeshLib/Elements/TriRule3.h
+++ b/MeshLib/Elements/TriRule3.h
@@ -81,4 +81,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/TriRule6.h b/MeshLib/Elements/TriRule6.h
index a64fafed359..6323752aeb9 100644
--- a/MeshLib/Elements/TriRule6.h
+++ b/MeshLib/Elements/TriRule6.h
@@ -52,4 +52,4 @@ public:
 
 }; /* class */
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Elements/VertexRule.h b/MeshLib/Elements/VertexRule.h
index b1a23173508..a8bc192db63 100644
--- a/MeshLib/Elements/VertexRule.h
+++ b/MeshLib/Elements/VertexRule.h
@@ -38,4 +38,4 @@ public:
 
 };
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/IO/Legacy/MeshIO.cpp b/MeshLib/IO/Legacy/MeshIO.cpp
index 9eab42dfd8d..74d3407ba85 100644
--- a/MeshLib/IO/Legacy/MeshIO.cpp
+++ b/MeshLib/IO/Legacy/MeshIO.cpp
@@ -342,4 +342,4 @@ std::string MeshIO::ElemType2StringOutput(const MeshLib::MeshElemType t) const
 
 } // end namespace Legacy
 } // end namespace IO
-} // end namespace MeshLin
+}  // namespace MeshLib
diff --git a/MeshLib/IO/MPI_IO/PropertyVectorMetaData.h b/MeshLib/IO/MPI_IO/PropertyVectorMetaData.h
index b9e1e5321a0..28459a12981 100644
--- a/MeshLib/IO/MPI_IO/PropertyVectorMetaData.h
+++ b/MeshLib/IO/MPI_IO/PropertyVectorMetaData.h
@@ -140,5 +140,5 @@ readPropertyVectorPartitionMetaData(std::istream& is)
         return boost::optional<PropertyVectorPartitionMetaData>();
     return boost::optional<PropertyVectorPartitionMetaData>(pvpmd);
 }
-}
-}
+}  // namespace IO
+}  // namespace MeshLib
diff --git a/MeshLib/IO/VtkIO/PVDFile.cpp b/MeshLib/IO/VtkIO/PVDFile.cpp
index 49c4da0659e..7aa484d1bae 100644
--- a/MeshLib/IO/VtkIO/PVDFile.cpp
+++ b/MeshLib/IO/VtkIO/PVDFile.cpp
@@ -42,5 +42,5 @@ void PVDFile::addVTUFile(const std::string &vtu_fname, double timestep)
     fh << "  </Collection>\n</VTKFile>\n";
 }
 
-} // IO
-} // MeshLib
+}  // namespace IO
+}  // namespace MeshLib
diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp
index de759c68756..c5a3c79d7be 100644
--- a/MeshLib/Mesh.cpp
+++ b/MeshLib/Mesh.cpp
@@ -421,4 +421,4 @@ std::unique_ptr<MeshLib::Mesh> createMeshFromElementSelection(
 
     return mesh;
 }
-}
+}  // namespace MeshLib
diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h
index 7f9e8c77bf2..1349d2a7512 100644
--- a/MeshLib/Mesh.h
+++ b/MeshLib/Mesh.h
@@ -303,4 +303,4 @@ PropertyVector<int> const* materialIDs(Mesh const& mesh);
 std::unique_ptr<MeshLib::Mesh> createMeshFromElementSelection(
     std::string mesh_name, std::vector<MeshLib::Element*> const& elements);
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/MeshEditing/FlipElements.h b/MeshLib/MeshEditing/FlipElements.h
index 0fe3c7374a7..8229b036cf1 100644
--- a/MeshLib/MeshEditing/FlipElements.h
+++ b/MeshLib/MeshEditing/FlipElements.h
@@ -37,4 +37,4 @@ std::unique_ptr<MeshLib::Element> createFlippedElement(MeshLib::Element const& e
  */
 std::unique_ptr<MeshLib::Mesh> createFlippedMesh(MeshLib::Mesh const& mesh);
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshEditing/MeshRevision.h b/MeshLib/MeshEditing/MeshRevision.h
index ef961829dda..adcaa308d65 100644
--- a/MeshLib/MeshEditing/MeshRevision.h
+++ b/MeshLib/MeshEditing/MeshRevision.h
@@ -190,4 +190,4 @@ private:
     static const std::array<unsigned,8> _hex_diametral_nodes;
 };
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshEditing/RemoveMeshComponents.cpp b/MeshLib/MeshEditing/RemoveMeshComponents.cpp
index 6b5aa7b6bc4..409776d7e47 100644
--- a/MeshLib/MeshEditing/RemoveMeshComponents.cpp
+++ b/MeshLib/MeshEditing/RemoveMeshComponents.cpp
@@ -39,7 +39,7 @@ std::vector<MeshLib::Element*> excludeElementCopy(
     return vec_dest_eles;
 }
 
-} // details
+}  // namespace details
 
 MeshLib::Mesh* removeElements(const MeshLib::Mesh& mesh, const std::vector<std::size_t> &removed_element_ids, const std::string &new_mesh_name)
 {
diff --git a/MeshLib/MeshEnums.cpp b/MeshLib/MeshEnums.cpp
index eaeae99bb36..7090a3b0f49 100644
--- a/MeshLib/MeshEnums.cpp
+++ b/MeshLib/MeshEnums.cpp
@@ -145,4 +145,4 @@ const std::string MeshQualityType2String(const MeshQualityType t)
     return "none";
 }
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshEnums.h b/MeshLib/MeshEnums.h
index 03b341ce6ca..20f48c0cbd2 100644
--- a/MeshLib/MeshEnums.h
+++ b/MeshLib/MeshEnums.h
@@ -106,4 +106,4 @@ const std::string CellType2String(const CellType t);
 
 const std::string MeshQualityType2String(const MeshQualityType t);
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshGenerators/MeshGenerator.cpp b/MeshLib/MeshGenerators/MeshGenerator.cpp
index d70e2e033a9..85794fb4f26 100644
--- a/MeshLib/MeshGenerators/MeshGenerator.cpp
+++ b/MeshLib/MeshGenerators/MeshGenerator.cpp
@@ -636,4 +636,4 @@ MeshGenerator::createSurfaceMesh(std::string const& mesh_name,
     return new MeshLib::Mesh(mesh_name, nodes, sfc_eles);
 }
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshGenerators/MeshGenerator.h b/MeshLib/MeshGenerators/MeshGenerator.h
index 3a34a39a74d..514aa4664fd 100644
--- a/MeshLib/MeshGenerators/MeshGenerator.h
+++ b/MeshLib/MeshGenerators/MeshGenerator.h
@@ -505,5 +505,5 @@ createSurfaceMesh(std::string const& mesh_name,
     std::array<std::size_t, 2> const& n_steps,
     const std::function<double(double,double)>& f);
 
-}  //MeshGenerator
-} //MeshLib
+}  // namespace MeshGenerator
+}  // namespace MeshLib
diff --git a/MeshLib/MeshInformation.cpp b/MeshLib/MeshInformation.cpp
index 89f53706ad5..eb7188c408d 100644
--- a/MeshLib/MeshInformation.cpp
+++ b/MeshLib/MeshInformation.cpp
@@ -42,4 +42,4 @@ const std::array<unsigned, 7> MeshInformation::getNumberOfElementTypes(const Mes
     return n_element_types;
 }
 
-} //end MeshLib
+}  // namespace MeshLib
diff --git a/MeshLib/MeshInformation.h b/MeshLib/MeshInformation.h
index cfb1e8c3e9a..c59bb97a14b 100644
--- a/MeshLib/MeshInformation.h
+++ b/MeshLib/MeshInformation.h
@@ -70,4 +70,4 @@ public:
 
 };
 
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshQuality/AngleSkewMetric.h b/MeshLib/MeshQuality/AngleSkewMetric.h
index 1f5e6e8ec68..cbf721f3f39 100644
--- a/MeshLib/MeshQuality/AngleSkewMetric.h
+++ b/MeshLib/MeshQuality/AngleSkewMetric.h
@@ -43,4 +43,4 @@ private:
                                     double const* const n1, double const* const n2,
                                     double &min_angle, double &max_angle) const;
 };
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshQuality/EdgeRatioMetric.h b/MeshLib/MeshQuality/EdgeRatioMetric.h
index 478128d1522..6ef677f5a88 100644
--- a/MeshLib/MeshQuality/EdgeRatioMetric.h
+++ b/MeshLib/MeshQuality/EdgeRatioMetric.h
@@ -47,4 +47,4 @@ private:
     double checkPyramid (std::vector<const MathLib::Point3d*> const& pnts) const;
     double checkHexahedron (std::vector<const MathLib::Point3d*> const& pnts) const;
 };
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshQuality/ElementQualityMetric.h b/MeshLib/MeshQuality/ElementQualityMetric.h
index 6632006c207..88d62720291 100644
--- a/MeshLib/MeshQuality/ElementQualityMetric.h
+++ b/MeshLib/MeshQuality/ElementQualityMetric.h
@@ -60,4 +60,4 @@ protected:
     Mesh const& _mesh;
     std::vector<double> _element_quality_metric;
 };
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshQuality/ElementSizeMetric.h b/MeshLib/MeshQuality/ElementSizeMetric.h
index 32b9fc9cae0..87730d76ad3 100644
--- a/MeshLib/MeshQuality/ElementSizeMetric.h
+++ b/MeshLib/MeshQuality/ElementSizeMetric.h
@@ -35,4 +35,4 @@ private:
     std::size_t calc2dQuality();
     std::size_t calc3dQuality();
 };
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
index cdc32ceede3..67a96afb401 100644
--- a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
+++ b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
@@ -31,4 +31,4 @@ public:
 
     void calculateQuality() override;
 };
-}
+}  // namespace MeshLib
diff --git a/MeshLib/MeshQuality/SizeDifferenceMetric.h b/MeshLib/MeshQuality/SizeDifferenceMetric.h
index 925a4c88d19..f05754b9bb9 100644
--- a/MeshLib/MeshQuality/SizeDifferenceMetric.h
+++ b/MeshLib/MeshQuality/SizeDifferenceMetric.h
@@ -31,4 +31,4 @@ public:
 
     void calculateQuality() override;
 };
-}
+}  // namespace MeshLib
diff --git a/MeshLib/Node.cpp b/MeshLib/Node.cpp
index 857c524d8fa..fbe4f712cae 100644
--- a/MeshLib/Node.cpp
+++ b/MeshLib/Node.cpp
@@ -62,5 +62,4 @@ bool isBaseNode(Node const& node)
     auto const local_index = e->getNodeIDinElement(&node);
     return local_index < n_base_nodes;
 }
-}
-
+}  // namespace MeshLib
diff --git a/MeshLib/Node.h b/MeshLib/Node.h
index 6db6d312242..e3470fff3f2 100644
--- a/MeshLib/Node.h
+++ b/MeshLib/Node.h
@@ -106,4 +106,4 @@ protected:
 /// is not connected to any element i.e. an unconnected node.
 bool isBaseNode(Node const& node);
 
-} /* namespace */
+}  // namespace MeshLib
diff --git a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate-impl.h b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate-impl.h
index 9f3145952f2..d4b399ca961 100644
--- a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate-impl.h
+++ b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate-impl.h
@@ -478,4 +478,4 @@ template <class Scalar> vtkIdType VtkMeshNodalCoordinatesTemplate<Scalar>
 }
 
 #endif  // vtk version
-} // end namespace
+}  // namespace MeshLib
diff --git a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
index 4648ed22a1d..feb32368809 100644
--- a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
+++ b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
@@ -131,6 +131,6 @@ private:
     double *TempDoubleArray;
 };
 
-} // end namespace
+}  // namespace MeshLib
 
 #include "VtkMeshNodalCoordinatesTemplate-impl.h"
diff --git a/MeshLib/convertMeshToGeo.cpp b/MeshLib/convertMeshToGeo.cpp
index bc1013cb0a4..90bea975822 100644
--- a/MeshLib/convertMeshToGeo.cpp
+++ b/MeshLib/convertMeshToGeo.cpp
@@ -112,5 +112,4 @@ MeshLib::Mesh* convertSurfaceToMesh(const GeoLib::Surface &sfc, const std::strin
     return rev.simplifyMesh(mesh_with_duplicated_nodes.getName(), eps);
 }
 
-}
-
+}  // namespace MeshLib
diff --git a/MeshLib/convertMeshToGeo.h b/MeshLib/convertMeshToGeo.h
index 8f70413d537..acd482b7caf 100644
--- a/MeshLib/convertMeshToGeo.h
+++ b/MeshLib/convertMeshToGeo.h
@@ -46,4 +46,4 @@ namespace MeshLib
      */
     MeshLib::Mesh* convertSurfaceToMesh(const GeoLib::Surface &sfc, const std::string &mesh_name, double eps = std::numeric_limits<double>::epsilon());
 
-} // namespace
+    }  // namespace MeshLib
diff --git a/MeshLib/findElementsWithinRadius.cpp b/MeshLib/findElementsWithinRadius.cpp
index 8d51c46bb9a..7d146be077e 100644
--- a/MeshLib/findElementsWithinRadius.cpp
+++ b/MeshLib/findElementsWithinRadius.cpp
@@ -101,4 +101,4 @@ std::vector<std::size_t> findElementsWithinRadius(Element const& start_element,
 
     return {std::begin(found_elements), std::end(found_elements)};
 }
-}
+}  // namespace MeshLib
diff --git a/NumLib/DOF/ComputeSparsityPattern.cpp b/NumLib/DOF/ComputeSparsityPattern.cpp
index 053d0d2c3ed..7bbe2f4541e 100644
--- a/NumLib/DOF/ComputeSparsityPattern.cpp
+++ b/NumLib/DOF/ComputeSparsityPattern.cpp
@@ -76,4 +76,4 @@ GlobalSparsityPattern computeSparsityPattern(
 #endif
 }
 
-}
+}  // namespace NumLib
diff --git a/NumLib/DOF/ComputeSparsityPattern.h b/NumLib/DOF/ComputeSparsityPattern.h
index ddc668490c1..0cf3606d0be 100644
--- a/NumLib/DOF/ComputeSparsityPattern.h
+++ b/NumLib/DOF/ComputeSparsityPattern.h
@@ -32,4 +32,4 @@ class LocalToGlobalIndexMap;
  */
 GlobalSparsityPattern computeSparsityPattern(
     LocalToGlobalIndexMap const& dof_table, MeshLib::Mesh const& mesh);
-}
+}  // namespace NumLib
diff --git a/NumLib/DOF/GlobalMatrixProviders.h b/NumLib/DOF/GlobalMatrixProviders.h
index 21eb6617862..57d096e5659 100644
--- a/NumLib/DOF/GlobalMatrixProviders.h
+++ b/NumLib/DOF/GlobalMatrixProviders.h
@@ -27,4 +27,4 @@ struct GlobalMatrixProvider
 
 void cleanupGlobalMatrixProviders();
 
-} // MathLib
+}  // namespace NumLib
diff --git a/NumLib/DOF/LocalToGlobalIndexMap.cpp b/NumLib/DOF/LocalToGlobalIndexMap.cpp
index 31cc95921e5..c23e28d1a6e 100644
--- a/NumLib/DOF/LocalToGlobalIndexMap.cpp
+++ b/NumLib/DOF/LocalToGlobalIndexMap.cpp
@@ -29,7 +29,7 @@ std::vector<T> to_cumulative(std::vector<T> const& vec)
     return result;
 }
 
-} // no named namespace
+}  // namespace
 
 int LocalToGlobalIndexMap::getGlobalComponent(int const variable_id,
                                               int const component_id) const
diff --git a/NumLib/DOF/SimpleMatrixVectorProvider.cpp b/NumLib/DOF/SimpleMatrixVectorProvider.cpp
index 49cbee04ee7..914aecb84a3 100644
--- a/NumLib/DOF/SimpleMatrixVectorProvider.cpp
+++ b/NumLib/DOF/SimpleMatrixVectorProvider.cpp
@@ -51,8 +51,7 @@ transfer(std::map<MatVec*, std::size_t>& from_used,
     from_used.erase(it);
 }
 
-} // detail
-
+}  // namespace detail
 
 namespace NumLib
 {
@@ -257,4 +256,4 @@ SimpleMatrixVectorProvider::
         delete ptr_id.first;
 }
 
-} // MathLib
+}  // namespace NumLib
diff --git a/NumLib/Distribution/Distribution.cpp b/NumLib/Distribution/Distribution.cpp
index f20c22d2c8b..2aef2ec8da4 100644
--- a/NumLib/Distribution/Distribution.cpp
+++ b/NumLib/Distribution/Distribution.cpp
@@ -33,4 +33,4 @@ std::vector<double> generateNodeValueDistribution(
     return vec_values;
 }
 
-} //NumLib
+}  // namespace NumLib
diff --git a/NumLib/Distribution/Distribution.h b/NumLib/Distribution/Distribution.h
index afcad351cd2..36771244c97 100644
--- a/NumLib/Distribution/Distribution.h
+++ b/NumLib/Distribution/Distribution.h
@@ -33,4 +33,4 @@ std::vector<double> generateNodeValueDistribution(
     const MeshLib::Mesh &msh,
     const std::vector<std::size_t> &vec_node_ids);
 
-} // NumLib
+}  // namespace NumLib
diff --git a/NumLib/Extrapolation/Extrapolator.h b/NumLib/Extrapolation/Extrapolator.h
index e1183a85608..0640f65268d 100644
--- a/NumLib/Extrapolation/Extrapolator.h
+++ b/NumLib/Extrapolation/Extrapolator.h
@@ -56,4 +56,4 @@ public:
     virtual ~Extrapolator() = default;
 };
 
-} // namespace ProcessLib
+}  // namespace NumLib
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
index 2025d57b0a7..b74e572e4f3 100644
--- a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
+++ b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
@@ -379,6 +379,6 @@ OGS_INSTANTIATE_NATURAL_COORDINATES_MAPPING_FIX(TetRule4, ShapeTet4, 3);
 OGS_INSTANTIATE_NATURAL_COORDINATES_MAPPING_FIX(TriRule3, ShapeTri3, 3);
 OGS_INSTANTIATE_NATURAL_COORDINATES_MAPPING_FIX(TriRule6, ShapeTri6, 3);
 
-} // detail
+}  // namespace detail
 
-} // NumLib
+}  // namespace NumLib
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
index 24505d3e09d..528738cadfd 100644
--- a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
+++ b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
@@ -84,4 +84,4 @@ struct NaturalCoordinatesMapping
     }
 };
 
-} // NumLib
+}  // namespace NumLib
diff --git a/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h b/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h
index e5a8a5f473d..8172ed31b6b 100644
--- a/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h
+++ b/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h
@@ -88,7 +88,7 @@ inline void setZero(ShapeMatrices<T_N, T_DNDR, T_J, T_DNDX> &shape, ShapeDataFie
     setZero(shape, ShapeDataFieldType<ShapeMatrixType::DNDX>());
 }
 
-} //detail
+}  // namespace detail
 
 template <class T_N, class T_DNDR, class T_J, class T_DNDX>
 inline void ShapeMatrices<T_N, T_DNDR, T_J, T_DNDX>::setZero()
@@ -121,5 +121,4 @@ std::ostream& operator<< (std::ostream &os, const ShapeMatrices<T_N, T_DNDR, T_J
     return os;
 }
 
-} // NumLib
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h b/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
index 2175b76e039..e42183e2869 100644
--- a/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
+++ b/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
@@ -108,7 +108,6 @@ struct ShapeMatrices
     EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
 }; // ShapeMatrices
 
-
-} // NumLib
+}  // namespace NumLib
 
 #include "ShapeMatrices-impl.h"
diff --git a/NumLib/Fem/FiniteElement/C0IsoparametricElements.h b/NumLib/Fem/FiniteElement/C0IsoparametricElements.h
index 40cd749e95d..df304db0739 100644
--- a/NumLib/Fem/FiniteElement/C0IsoparametricElements.h
+++ b/NumLib/Fem/FiniteElement/C0IsoparametricElements.h
@@ -145,4 +145,4 @@ struct FePYRA13
         TemplateIsoparametric<ShapePyra13, T_SHAPE_MATRIX_POLICY<ShapePyra13>>;
 };
 
-} // NumLib
+}  // namespace NumLib
diff --git a/NumLib/Fem/Integration/IntegrationPoint.h b/NumLib/Fem/Integration/IntegrationPoint.h
index 479ad6f0c02..04e88a8db4f 100644
--- a/NumLib/Fem/Integration/IntegrationPoint.h
+++ b/NumLib/Fem/Integration/IntegrationPoint.h
@@ -76,4 +76,4 @@ public:
         return 1;
     }
 };
-}
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeHex20-impl.h b/NumLib/Fem/ShapeFunction/ShapeHex20-impl.h
index 1d87d7d5fdf..51be4724525 100644
--- a/NumLib/Fem/ShapeFunction/ShapeHex20-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeHex20-impl.h
@@ -48,7 +48,7 @@ inline double dShapeFunctionHexHQ_Middle(const double r, const double s, const d
     return 0.0;
 }
 
-}
+}  // namespace
 
 namespace NumLib
 {
@@ -125,5 +125,4 @@ void ShapeHex20::computeGradShapeFunction(const T_X &rst, T_N &dNdr)
     }
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeHex20.h b/NumLib/Fem/ShapeFunction/ShapeHex20.h
index f45bd79c08e..04b7bc0cafc 100644
--- a/NumLib/Fem/ShapeFunction/ShapeHex20.h
+++ b/NumLib/Fem/ShapeFunction/ShapeHex20.h
@@ -44,6 +44,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeHex20-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeHex8-impl.h b/NumLib/Fem/ShapeFunction/ShapeHex8-impl.h
index 63640d1b369..524c843807b 100644
--- a/NumLib/Fem/ShapeFunction/ShapeHex8-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeHex8-impl.h
@@ -57,5 +57,4 @@ void ShapeHex8::computeGradShapeFunction(const T_X &r, T_N &dN)
     dN[23] = -dN[19];
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeHex8.h b/NumLib/Fem/ShapeFunction/ShapeHex8.h
index c3e52b7c0c7..16f4be583b3 100644
--- a/NumLib/Fem/ShapeFunction/ShapeHex8.h
+++ b/NumLib/Fem/ShapeFunction/ShapeHex8.h
@@ -62,6 +62,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeHex8-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeLine2-impl.h b/NumLib/Fem/ShapeFunction/ShapeLine2-impl.h
index 456e929a973..4f2100611fd 100644
--- a/NumLib/Fem/ShapeFunction/ShapeLine2-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeLine2-impl.h
@@ -24,5 +24,4 @@ void ShapeLine2::computeGradShapeFunction(const T_X &/*r*/, T_N &dN)
     dN[1] = 0.5;
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeLine2.h b/NumLib/Fem/ShapeFunction/ShapeLine2.h
index 3b578cf7916..eee67f2ecd3 100644
--- a/NumLib/Fem/ShapeFunction/ShapeLine2.h
+++ b/NumLib/Fem/ShapeFunction/ShapeLine2.h
@@ -48,6 +48,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeLine2-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeLine3-impl.h b/NumLib/Fem/ShapeFunction/ShapeLine3-impl.h
index 9b547f8dc5f..74dd1f60f14 100644
--- a/NumLib/Fem/ShapeFunction/ShapeLine3-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeLine3-impl.h
@@ -26,5 +26,4 @@ void ShapeLine3::computeGradShapeFunction(const T_X &r, T_N &dN)
     dN[2] = -2.0 * r[0];
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeLine3.h b/NumLib/Fem/ShapeFunction/ShapeLine3.h
index edb947f6a29..11c586720b9 100644
--- a/NumLib/Fem/ShapeFunction/ShapeLine3.h
+++ b/NumLib/Fem/ShapeFunction/ShapeLine3.h
@@ -43,6 +43,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeLine3-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapePoint1.h b/NumLib/Fem/ShapeFunction/ShapePoint1.h
index 3d156cdc50e..47ae0473fb4 100644
--- a/NumLib/Fem/ShapeFunction/ShapePoint1.h
+++ b/NumLib/Fem/ShapeFunction/ShapePoint1.h
@@ -28,6 +28,6 @@ public:
     static const unsigned DIM = MeshElement::dimension;
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
-}
+}  // namespace NumLib
 
 #include "ShapePoint1-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapePrism15-impl.h b/NumLib/Fem/ShapeFunction/ShapePrism15-impl.h
index 1f37d99964d..541eea84715 100644
--- a/NumLib/Fem/ShapeFunction/ShapePrism15-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapePrism15-impl.h
@@ -131,5 +131,4 @@ void ShapePrism15::computeGradShapeFunction(const T_X &x, T_N &dN)
     dN[44] = -2.0 * L2 * t;
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapePrism15.h b/NumLib/Fem/ShapeFunction/ShapePrism15.h
index 89dc2d82303..26dab800d4b 100644
--- a/NumLib/Fem/ShapeFunction/ShapePrism15.h
+++ b/NumLib/Fem/ShapeFunction/ShapePrism15.h
@@ -44,6 +44,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapePrism15-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapePrism6-impl.h b/NumLib/Fem/ShapeFunction/ShapePrism6-impl.h
index a4c6d0cd39a..5ec27d1c8c1 100644
--- a/NumLib/Fem/ShapeFunction/ShapePrism6-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapePrism6-impl.h
@@ -53,5 +53,4 @@ void ShapePrism6::computeGradShapeFunction(const T_X &x, T_N &dN)
     dN[17] = -dN[14];
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapePrism6.h b/NumLib/Fem/ShapeFunction/ShapePrism6.h
index 22e47ec0198..12dd8456be5 100644
--- a/NumLib/Fem/ShapeFunction/ShapePrism6.h
+++ b/NumLib/Fem/ShapeFunction/ShapePrism6.h
@@ -44,6 +44,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapePrism6-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapePyra13-impl.h b/NumLib/Fem/ShapeFunction/ShapePyra13-impl.h
index 1f6b4543364..5f07094edb7 100644
--- a/NumLib/Fem/ShapeFunction/ShapePyra13-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapePyra13-impl.h
@@ -84,5 +84,4 @@ void ShapePyra13::computeGradShapeFunction(const T_X &x, T_N &dN)
     dN[38] = -0.5 * (1.0 - r) * (1.0 + s) * t;
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapePyra13.h b/NumLib/Fem/ShapeFunction/ShapePyra13.h
index 2967afae3a6..d66f49fac80 100644
--- a/NumLib/Fem/ShapeFunction/ShapePyra13.h
+++ b/NumLib/Fem/ShapeFunction/ShapePyra13.h
@@ -44,6 +44,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapePyra13-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapePyra5-impl.h b/NumLib/Fem/ShapeFunction/ShapePyra5-impl.h
index aef0468d8ca..5d9f43a74a9 100644
--- a/NumLib/Fem/ShapeFunction/ShapePyra5-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapePyra5-impl.h
@@ -50,5 +50,4 @@ void ShapePyra5::computeGradShapeFunction(const T_X &x, T_N &dN)
     dN[14] = 0.5;
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapePyra5.h b/NumLib/Fem/ShapeFunction/ShapePyra5.h
index 9a4f07422a5..2bd1fd5a525 100644
--- a/NumLib/Fem/ShapeFunction/ShapePyra5.h
+++ b/NumLib/Fem/ShapeFunction/ShapePyra5.h
@@ -44,6 +44,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapePyra5-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad4-impl.h b/NumLib/Fem/ShapeFunction/ShapeQuad4-impl.h
index 0f373d00dfc..305c85c83cb 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad4-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad4-impl.h
@@ -35,5 +35,4 @@ void ShapeQuad4::computeGradShapeFunction(const T_X &r, T_N &dN)
     dN[7] = -(1.0 + r[0]) / 4;
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad4.h b/NumLib/Fem/ShapeFunction/ShapeQuad4.h
index 15e77920f38..2857a019862 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad4.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad4.h
@@ -56,6 +56,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeQuad4-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad8-impl.h b/NumLib/Fem/ShapeFunction/ShapeQuad8-impl.h
index a909cbb1e80..bba05a1a3e8 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad8-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad8-impl.h
@@ -53,5 +53,4 @@ void ShapeQuad8::computeGradShapeFunction(const T_X &rs, T_N &dNdr)
     dNdr[15] = -(1 + r) * s;
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad8.h b/NumLib/Fem/ShapeFunction/ShapeQuad8.h
index 6c7683d6166..c0fddbe9336 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad8.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad8.h
@@ -43,6 +43,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeQuad8-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad9-impl.h b/NumLib/Fem/ShapeFunction/ShapeQuad9-impl.h
index 6ac7d32d6ec..fa08753f88d 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad9-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad9-impl.h
@@ -46,5 +46,4 @@ void ShapeQuad9::computeGradShapeFunction(const T_X& r, T_N& dNdr)
     dNdr[17] = 2 * r[1] * (r[0] * r[0] - 1);
     dNdr[9] = (r[1] + 0.5) * r[0] * (r[0] + 1) / 2;
 }
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad9.h b/NumLib/Fem/ShapeFunction/ShapeQuad9.h
index a47408472ff..3e7154de030 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad9.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad9.h
@@ -43,6 +43,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeQuad9-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp b/NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp
index e0bdcef97d4..a21c0a6f318 100644
--- a/NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp
+++ b/NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp
@@ -88,4 +88,4 @@ const unsigned ShapeTri3::NPOINTS;
 const unsigned ShapeTri6::DIM;
 const unsigned ShapeTri6::NPOINTS;
 
-}
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeTet10-impl.h b/NumLib/Fem/ShapeFunction/ShapeTet10-impl.h
index 3c8a7e5559e..23db9d96bfc 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTet10-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTet10-impl.h
@@ -62,5 +62,4 @@ void ShapeTet10::computeGradShapeFunction(const T_X &r, T_N &dNdr)
     dNdr[29] = 4.0 * r[1];
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeTet10.h b/NumLib/Fem/ShapeFunction/ShapeTet10.h
index 044176a8ddc..6f032709cd3 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTet10.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTet10.h
@@ -44,6 +44,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeTet10-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeTet4-impl.h b/NumLib/Fem/ShapeFunction/ShapeTet4-impl.h
index 5df41174c9e..4a0d8bcb072 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTet4-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTet4-impl.h
@@ -41,5 +41,4 @@ void ShapeTet4::computeGradShapeFunction(const T_X &/*r*/, T_N &dNdr)
     dNdr[11] = 1.0;
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeTet4.h b/NumLib/Fem/ShapeFunction/ShapeTet4.h
index 6ec0c2d1617..b53b34f8bc5 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTet4.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTet4.h
@@ -44,6 +44,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeTet4-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeTri3-impl.h b/NumLib/Fem/ShapeFunction/ShapeTri3-impl.h
index 0e191788706..1303b669aa2 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTri3-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTri3-impl.h
@@ -36,5 +36,4 @@ void ShapeTri3::computeGradShapeFunction(const T_X &/*r*/, T_N &dN)
     dN[5] = 1.0;
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeTri3.h b/NumLib/Fem/ShapeFunction/ShapeTri3.h
index 557e1a2bfc3..b3c9901c611 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTri3.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTri3.h
@@ -57,6 +57,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeTri3-impl.h"
diff --git a/NumLib/Fem/ShapeFunction/ShapeTri6-impl.h b/NumLib/Fem/ShapeFunction/ShapeTri6-impl.h
index d0293c65843..390433e03c1 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTri6-impl.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTri6-impl.h
@@ -43,5 +43,4 @@ void ShapeTri6::computeGradShapeFunction(const T_X &r, T_N &dNdr)
     dNdr[11] = 4. * (1 - r[0] - 2. * r[1]); // dN6/dL2
 }
 
-}
-
+}  // namespace NumLib
diff --git a/NumLib/Fem/ShapeFunction/ShapeTri6.h b/NumLib/Fem/ShapeFunction/ShapeTri6.h
index 4f47a15411d..d1854e18574 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTri6.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTri6.h
@@ -45,6 +45,6 @@ public:
     static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
-}
+}  // namespace NumLib
 
 #include "ShapeTri6-impl.h"
diff --git a/NumLib/Fem/ShapeMatrixPolicy.h b/NumLib/Fem/ShapeMatrixPolicy.h
index 05450d0961a..7f8d15f5996 100644
--- a/NumLib/Fem/ShapeMatrixPolicy.h
+++ b/NumLib/Fem/ShapeMatrixPolicy.h
@@ -47,7 +47,7 @@ namespace detail
         using type = Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::ColMajor>;
     };
 
-}   // detail
+    }  // namespace detail
 
 /// An implementation of ShapeMatrixPolicy using fixed size (compile-time) eigen
 /// matrices and vectors.
diff --git a/NumLib/Function/ISpatialFunction.h b/NumLib/Function/ISpatialFunction.h
index fe3e018ac7c..f674a12c36b 100644
--- a/NumLib/Function/ISpatialFunction.h
+++ b/NumLib/Function/ISpatialFunction.h
@@ -35,4 +35,4 @@ public:
     virtual double operator()(const MathLib::Point3d& pnt) const = 0;
 };
 
-} // NumLib
+}  // namespace NumLib
diff --git a/NumLib/Function/LinearInterpolationAlongPolyline.cpp b/NumLib/Function/LinearInterpolationAlongPolyline.cpp
index a8bd96ea271..281435abd18 100644
--- a/NumLib/Function/LinearInterpolationAlongPolyline.cpp
+++ b/NumLib/Function/LinearInterpolationAlongPolyline.cpp
@@ -65,5 +65,4 @@ double LinearInterpolationAlongPolyline::operator()(const MathLib::Point3d& pnt)
     return dist>=0 ? _interpolation.getValue(dist) : _default_value;
 }
 
-} // NumLib
-
+}  // namespace NumLib
diff --git a/NumLib/Function/LinearInterpolationAlongPolyline.h b/NumLib/Function/LinearInterpolationAlongPolyline.h
index cdd1dbcfb8f..8e733c589ac 100644
--- a/NumLib/Function/LinearInterpolationAlongPolyline.h
+++ b/NumLib/Function/LinearInterpolationAlongPolyline.h
@@ -75,4 +75,4 @@ private:
     const double _default_value;
 };
 
-} // NumLib
+}  // namespace NumLib
diff --git a/NumLib/Function/LinearInterpolationOnSurface.cpp b/NumLib/Function/LinearInterpolationOnSurface.cpp
index d917ff4a869..a0463032395 100644
--- a/NumLib/Function/LinearInterpolationOnSurface.cpp
+++ b/NumLib/Function/LinearInterpolationOnSurface.cpp
@@ -110,5 +110,4 @@ double LinearInterpolationOnSurface::interpolateInTri(
     return val;
 }
 
-} // NumLib
-
+}  // namespace NumLib
diff --git a/NumLib/Function/LinearInterpolationOnSurface.h b/NumLib/Function/LinearInterpolationOnSurface.h
index 0d3bd1c23b6..ac020a81393 100644
--- a/NumLib/Function/LinearInterpolationOnSurface.h
+++ b/NumLib/Function/LinearInterpolationOnSurface.h
@@ -94,4 +94,4 @@ private:
     const double _default_value;
 };
 
-} // NumLib
+}  // namespace NumLib
diff --git a/NumLib/Function/TemplateSpatialFunction.h b/NumLib/Function/TemplateSpatialFunction.h
index d5a9c4ae6f5..f645ace89e3 100644
--- a/NumLib/Function/TemplateSpatialFunction.h
+++ b/NumLib/Function/TemplateSpatialFunction.h
@@ -48,4 +48,4 @@ private:
     const T_FUNCTION _f;
 };
 
-}
+}  // namespace NumLib
diff --git a/NumLib/IndexValueVector.h b/NumLib/IndexValueVector.h
index 16ef2cab8e8..587b4c6436a 100644
--- a/NumLib/IndexValueVector.h
+++ b/NumLib/IndexValueVector.h
@@ -21,4 +21,4 @@ struct IndexValueVector final
     std::vector<double> values;
 };
 
-}
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/ConvergenceCriterion.cpp b/NumLib/ODESolver/ConvergenceCriterion.cpp
index 1e7fb09b795..04c39d19a8b 100644
--- a/NumLib/ODESolver/ConvergenceCriterion.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterion.cpp
@@ -51,4 +51,4 @@ bool checkRelativeTolerance(const double reltol, const double numerator,
            std::abs(reltol) * (std::abs(denominator) + eps);
 }
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp b/NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp
index 72776e38b59..50a5e55ec86 100644
--- a/NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp
@@ -75,4 +75,4 @@ std::unique_ptr<ConvergenceCriterionDeltaX> createConvergenceCriterionDeltaX(
         std::move(abstol), std::move(reltol), norm_type);
 }
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/ConvergenceCriterionDeltaX.h b/NumLib/ODESolver/ConvergenceCriterionDeltaX.h
index 8d54841dbef..3f451db5ef3 100644
--- a/NumLib/ODESolver/ConvergenceCriterionDeltaX.h
+++ b/NumLib/ODESolver/ConvergenceCriterionDeltaX.h
@@ -44,4 +44,4 @@ private:
 std::unique_ptr<ConvergenceCriterionDeltaX> createConvergenceCriterionDeltaX(
     BaseLib::ConfigTree const& config);
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp b/NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp
index e3e75b604c7..17df667db5f 100644
--- a/NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp
@@ -116,4 +116,4 @@ createConvergenceCriterionPerComponentDeltaX(const BaseLib::ConfigTree& config)
         std::move(*abstols), std::move(*reltols), norm_type);
 }
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp b/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
index adcca76a16b..a9c5d71a920 100644
--- a/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
@@ -151,4 +151,4 @@ createConvergenceCriterionPerComponentResidual(
         std::move(*abstols), std::move(*reltols), norm_type);
 }
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/ConvergenceCriterionResidual.cpp b/NumLib/ODESolver/ConvergenceCriterionResidual.cpp
index 55ab5836235..a2641d7cb50 100644
--- a/NumLib/ODESolver/ConvergenceCriterionResidual.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionResidual.cpp
@@ -109,4 +109,4 @@ createConvergenceCriterionResidual(const BaseLib::ConfigTree& config)
         std::move(abstol), std::move(reltol), norm_type);
 }
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/ConvergenceCriterionResidual.h b/NumLib/ODESolver/ConvergenceCriterionResidual.h
index e20e2309872..f410856ddb4 100644
--- a/NumLib/ODESolver/ConvergenceCriterionResidual.h
+++ b/NumLib/ODESolver/ConvergenceCriterionResidual.h
@@ -46,4 +46,4 @@ private:
 std::unique_ptr<ConvergenceCriterionResidual> createConvergenceCriterionResidual(
     BaseLib::ConfigTree const& config);
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/EquationSystem.h b/NumLib/ODESolver/EquationSystem.h
index be4eb2b7533..c64c62ade9f 100644
--- a/NumLib/ODESolver/EquationSystem.h
+++ b/NumLib/ODESolver/EquationSystem.h
@@ -64,4 +64,4 @@ public:
 };
 
 //! @}
-}
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/MatrixTranslator.cpp b/NumLib/ODESolver/MatrixTranslator.cpp
index 930a2f07c07..a65c0dfb552 100644
--- a/NumLib/ODESolver/MatrixTranslator.cpp
+++ b/NumLib/ODESolver/MatrixTranslator.cpp
@@ -222,4 +222,4 @@ void MatrixTranslatorCrankNicolson<
     LinAlg::scale(_b_bar, 1.0 - theta);
 }
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/MatrixTranslator.h b/NumLib/ODESolver/MatrixTranslator.h
index 0fce925f462..b82b508e5a6 100644
--- a/NumLib/ODESolver/MatrixTranslator.h
+++ b/NumLib/ODESolver/MatrixTranslator.h
@@ -308,4 +308,4 @@ std::unique_ptr<MatrixTranslator<ODETag>> createMatrixTranslator(
 }
 
 //! @}
-}
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/NonlinearSolver.cpp b/NumLib/ODESolver/NonlinearSolver.cpp
index ae8d9419402..5a8eb8f6399 100644
--- a/NumLib/ODESolver/NonlinearSolver.cpp
+++ b/NumLib/ODESolver/NonlinearSolver.cpp
@@ -359,4 +359,4 @@ createNonlinearSolver(GlobalLinearSolver& linear_solver,
     }
     OGS_FATAL("Unsupported nonlinear solver type");
 }
-}
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/NonlinearSystem.h b/NumLib/ODESolver/NonlinearSystem.h
index 8cb605e54ca..35fa141a857 100644
--- a/NumLib/ODESolver/NonlinearSystem.h
+++ b/NumLib/ODESolver/NonlinearSystem.h
@@ -106,4 +106,4 @@ public:
 };
 
 //! @}
-}
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/TimeDiscretization.cpp b/NumLib/ODESolver/TimeDiscretization.cpp
index 233892fb53b..3df5e23d292 100644
--- a/NumLib/ODESolver/TimeDiscretization.cpp
+++ b/NumLib/ODESolver/TimeDiscretization.cpp
@@ -107,7 +107,7 @@ const double BDF_Coeffs[6][7] = {
     // coefficient of (for BDF(6), the oldest state, x_n, is always rightmost)
     //        x_+6, x_+5, x_+4,       x_+3,  x_+2, x_+1,     x_n
 };
-}
+}  // namespace detail
 
 double BackwardDifferentiationFormula::getNewXWeight() const
 {
diff --git a/NumLib/ODESolver/TimeDiscretization.h b/NumLib/ODESolver/TimeDiscretization.h
index 8eeceb1ff97..c1b5db164c9 100644
--- a/NumLib/ODESolver/TimeDiscretization.h
+++ b/NumLib/ODESolver/TimeDiscretization.h
@@ -518,4 +518,4 @@ private:
 };
 
 //! @}
-}
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/TimeDiscretizationBuilder.cpp b/NumLib/ODESolver/TimeDiscretizationBuilder.cpp
index 2d608f6dc15..e6a8d73de1f 100644
--- a/NumLib/ODESolver/TimeDiscretizationBuilder.cpp
+++ b/NumLib/ODESolver/TimeDiscretizationBuilder.cpp
@@ -46,4 +46,4 @@ std::unique_ptr<TimeDiscretization> createTimeDiscretization(
 
     OGS_FATAL("Unrecognized time discretization type `%s'", type.c_str());
 }
-}
+}  // namespace NumLib
diff --git a/NumLib/ODESolver/TimeDiscretizedODESystem.h b/NumLib/ODESolver/TimeDiscretizedODESystem.h
index 66967798fd0..913df22fbdb 100644
--- a/NumLib/ODESolver/TimeDiscretizedODESystem.h
+++ b/NumLib/ODESolver/TimeDiscretizedODESystem.h
@@ -245,4 +245,4 @@ private:
 };
 
 //! @}
-}
+}  // namespace NumLib
diff --git a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp
index f9fa3c94130..52dda10f019 100644
--- a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp
+++ b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp
@@ -62,4 +62,4 @@ double FixedTimeStepping::computeEnd(double t_initial,
     return std::min(t_end, t_sum);
 }
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h
index 9c555b8af2a..b7fdf291aeb 100644
--- a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h
+++ b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h
@@ -68,4 +68,4 @@ private:
                              const std::vector<double>& dt_vector);
 };
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/NumLib/TimeStepping/TimeStep.h b/NumLib/TimeStepping/TimeStep.h
index 5eede2eb378..225fa46e367 100644
--- a/NumLib/TimeStepping/TimeStep.h
+++ b/NumLib/TimeStepping/TimeStep.h
@@ -122,4 +122,4 @@ private:
     std::size_t _steps;
 };
 
-}  // NumLib
+}  // namespace NumLib
diff --git a/ProcessLib/AbstractJacobianAssembler.h b/ProcessLib/AbstractJacobianAssembler.h
index 40d17a1b524..d433649e89a 100644
--- a/ProcessLib/AbstractJacobianAssembler.h
+++ b/ProcessLib/AbstractJacobianAssembler.h
@@ -49,4 +49,4 @@ public:
     virtual ~AbstractJacobianAssembler() = default;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/AnalyticalJacobianAssembler.cpp b/ProcessLib/AnalyticalJacobianAssembler.cpp
index eb888a88292..4f463cc9dcb 100644
--- a/ProcessLib/AnalyticalJacobianAssembler.cpp
+++ b/ProcessLib/AnalyticalJacobianAssembler.cpp
@@ -38,4 +38,4 @@ void AnalyticalJacobianAssembler::assembleWithJacobianForStaggeredScheme(
         local_b_data, local_Jac_data, local_coupled_solutions);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/AnalyticalJacobianAssembler.h b/ProcessLib/AnalyticalJacobianAssembler.h
index e2d11513eb5..c5045c8438d 100644
--- a/ProcessLib/AnalyticalJacobianAssembler.h
+++ b/ProcessLib/AnalyticalJacobianAssembler.h
@@ -47,4 +47,4 @@ public:
         LocalCoupledSolutions const& local_coupled_solutions) override;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/BoundaryCondition.h b/ProcessLib/BoundaryCondition/BoundaryCondition.h
index 4f6da3c4051..127bbe49f24 100644
--- a/ProcessLib/BoundaryCondition/BoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/BoundaryCondition.h
@@ -59,4 +59,4 @@ public:
     virtual ~BoundaryCondition() = default;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/BoundaryConditionCollection.h b/ProcessLib/BoundaryCondition/BoundaryConditionCollection.h
index 3f6bdca9084..d957ef0e18d 100644
--- a/ProcessLib/BoundaryCondition/BoundaryConditionCollection.h
+++ b/ProcessLib/BoundaryCondition/BoundaryConditionCollection.h
@@ -65,5 +65,4 @@ private:
     std::vector<std::unique_ptr<ParameterBase>> const& _parameters;
 };
 
-
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
index 0db3f2e927a..87a351ca4aa 100644
--- a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
@@ -170,4 +170,4 @@ private:
     MathLib::Vector3 const _surface_element_normal;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.cpp b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.cpp
index fc79b03e4de..0e16093b5b6 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.cpp
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.cpp
@@ -95,4 +95,4 @@ void getEssentialBCValuesLocal(
         }
     }
 }
-}  // end of name space
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.h b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.h
index 509b095407b..db69d1b76a4 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.h
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.h
@@ -51,4 +51,4 @@ void getEssentialBCValuesLocal(
     int const variable_id, int const component_id, const double t,
     GlobalVector const& x,
     NumLib::IndexValueVector<GlobalIndexType>& bc_values);
-}  // end of name space
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h b/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
index 7dd34ab153c..cbbf16746a5 100644
--- a/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
+++ b/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
@@ -92,4 +92,4 @@ void GenericNaturalBoundaryCondition<
         _local_assemblers, *_dof_table_boundary, t, x, K, b, Jac);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h
index 9fd4a8affb1..f3082223674 100644
--- a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h
@@ -54,6 +54,6 @@ private:
         _local_assemblers;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
 
 #include "GenericNonuniformNaturalBoundaryCondition-impl.h"
diff --git a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
index 142bee514e6..a94d1f6588b 100644
--- a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
@@ -48,4 +48,4 @@ std::unique_ptr<NeumannBoundaryCondition> createNeumannBoundaryCondition(
         component_id, global_dim, bc_mesh, param);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h
index 03a0deed29f..e9dd44035d2 100644
--- a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h
@@ -25,4 +25,4 @@ std::unique_ptr<NeumannBoundaryCondition> createNeumannBoundaryCondition(
     unsigned const shapefunction_order, unsigned const global_dim,
     std::vector<std::unique_ptr<ParameterBase>> const& parameters);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.cpp
index 2d7098b76e6..5786e0947c6 100644
--- a/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.cpp
@@ -60,4 +60,4 @@ createNonuniformDirichletBoundaryCondition(
         boundary_mesh, *property, dof_table, variable_id, component_id);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.h b/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.h
index 38daf78ed68..4d81295cf72 100644
--- a/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.h
@@ -124,4 +124,4 @@ createNonuniformDirichletBoundaryCondition(
     NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
     int const component_id);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp
index baa479cec33..bbe963d3cae 100644
--- a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp
@@ -89,4 +89,4 @@ createNonuniformNeumannBoundaryCondition(
             variable_id, component_id});
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.h b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.h
index 31a05504673..50cb24c44bb 100644
--- a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.h
@@ -27,4 +27,4 @@ createNonuniformNeumannBoundaryCondition(
     int const component_id, unsigned const integration_order,
     unsigned const shapefunction_order, const MeshLib::Mesh& bulk_mesh);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
index dcfed5bdd7d..3f7870f9dbd 100644
--- a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
@@ -51,4 +51,4 @@ std::unique_ptr<RobinBoundaryCondition> createRobinBoundaryCondition(
         RobinBoundaryConditionData{alpha, u_0});
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.h b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.h
index b477a535619..30b8c941df7 100644
--- a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.h
@@ -36,4 +36,4 @@ std::unique_ptr<RobinBoundaryCondition> createRobinBoundaryCondition(
     unsigned const shapefunction_order, unsigned const global_dim,
     std::vector<std::unique_ptr<ParameterBase>> const& parameters);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/RobinBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/RobinBoundaryConditionLocalAssembler.h
index 5e8992c56e8..715cbc137ca 100644
--- a/ProcessLib/BoundaryCondition/RobinBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/RobinBoundaryConditionLocalAssembler.h
@@ -91,4 +91,4 @@ public:
     EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/CentralDifferencesJacobianAssembler.cpp b/ProcessLib/CentralDifferencesJacobianAssembler.cpp
index e8702cf9d08..bed278a60f4 100644
--- a/ProcessLib/CentralDifferencesJacobianAssembler.cpp
+++ b/ProcessLib/CentralDifferencesJacobianAssembler.cpp
@@ -170,4 +170,4 @@ createCentralDifferencesJacobianAssembler(BaseLib::ConfigTree const& config)
         std::move(abs_eps));
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/CentralDifferencesJacobianAssembler.h b/ProcessLib/CentralDifferencesJacobianAssembler.h
index cb4009a68d9..a0adf14797b 100644
--- a/ProcessLib/CentralDifferencesJacobianAssembler.h
+++ b/ProcessLib/CentralDifferencesJacobianAssembler.h
@@ -71,4 +71,4 @@ private:
 std::unique_ptr<CentralDifferencesJacobianAssembler>
 createCentralDifferencesJacobianAssembler(BaseLib::ConfigTree const& config);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/CoupledSolutionsForStaggeredScheme.h b/ProcessLib/CoupledSolutionsForStaggeredScheme.h
index f7b238847ce..3f6db1a17a1 100644
--- a/ProcessLib/CoupledSolutionsForStaggeredScheme.h
+++ b/ProcessLib/CoupledSolutionsForStaggeredScheme.h
@@ -94,4 +94,4 @@ std::vector<std::vector<double>> getPreviousLocalSolutions(
 std::vector<std::vector<double>> getCurrentLocalSolutions(
     const CoupledSolutionsForStaggeredScheme& cpl_xs,
     const std::vector<std::vector<GlobalIndexType>>& indices);
-}  // end of ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/CreateJacobianAssembler.cpp b/ProcessLib/CreateJacobianAssembler.cpp
index ba253bc5989..b149987e13e 100644
--- a/ProcessLib/CreateJacobianAssembler.cpp
+++ b/ProcessLib/CreateJacobianAssembler.cpp
@@ -40,4 +40,4 @@ std::unique_ptr<AbstractJacobianAssembler> createJacobianAssembler(
 
     OGS_FATAL("Unknown Jacobian assembler type: `%s'.", type.c_str());
 }
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Deformation/LinearBMatrix.h b/ProcessLib/Deformation/LinearBMatrix.h
index e6322a6dde5..b30419ae88e 100644
--- a/ProcessLib/Deformation/LinearBMatrix.h
+++ b/ProcessLib/Deformation/LinearBMatrix.h
@@ -30,7 +30,7 @@ void fillBMatrix2DCartesianPart(DNDX_Type const& dNdx, BMatrixType& B)
         B(0, i) = dNdx(0, i);
     }
 }
-}  // detail
+}  // namespace detail
 
 /// Fills a B-matrix based on given shape function dN/dx values.
 template <int DisplacementDim,
diff --git a/ProcessLib/HydroMechanics/CreateLocalAssemblers.h b/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
index 6563b30f391..ebb76b8ae90 100644
--- a/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
+++ b/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
@@ -81,6 +81,6 @@ void createLocalAssemblers(
         dof_table, shapefunction_order, mesh_elements, local_assemblers,
         std::forward<ExtraCtorArgs>(extra_ctor_args)...);
 }
-}  // HydroMechanics
+}  // namespace HydroMechanics
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.cpp b/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.cpp
index c2f97186682..fff96752fab 100644
--- a/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.cpp
+++ b/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.cpp
@@ -101,5 +101,5 @@ createLiquidFlowMaterialProperties(
         std::move(porosity_models), std::move(storage_models), material_ids);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.h b/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.h
index 58c80b85caa..6721514df1b 100644
--- a/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.h
+++ b/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.h
@@ -47,5 +47,5 @@ createLiquidFlowMaterialProperties(
     std::vector<std::unique_ptr<ParameterBase>> const& parameters,
     MeshLib::PropertyVector<int> const* const material_ids);
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp
index 5120d3c421b..e9a2ec112fa 100644
--- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp
+++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp
@@ -108,5 +108,5 @@ std::unique_ptr<Process> createLiquidFlowProcess(
         reference_temperature, mat_config}};
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h
index ee7431f62af..2ae8ebce567 100644
--- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h
+++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h
@@ -27,4 +27,4 @@ std::unique_ptr<Process> createLiquidFlowProcess(
     unsigned const integration_order,
     BaseLib::ConfigTree const& config);
 }  // end of namespace
-}  // end of namespace
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
index ab16c17850b..c12919c3328 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
@@ -271,5 +271,5 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
     }
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
index 82029659bae..da251f2404d 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
@@ -220,7 +220,7 @@ private:
     const LiquidFlowMaterialProperties& _material_properties;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
 
 #include "LiquidFlowLocalAssembler-impl.h"
diff --git a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp
index 83878977d26..014d585f99a 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp
+++ b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp
@@ -102,5 +102,5 @@ Eigen::MatrixXd const& LiquidFlowMaterialProperties::getPermeability(
                                                                  0.0);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h
index 69aa2a3b1d5..2fdc8c83893 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h
@@ -124,5 +124,5 @@ private:
     // Such property vectors will be added here if they are needed.
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
index cc95c385f45..a2f82b798fa 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
+++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
@@ -131,5 +131,5 @@ void LiquidFlowProcess::computeSecondaryVariableConcrete(const double t,
         getDOFTable(process_id), t, x, _coupled_solutions);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.h b/ProcessLib/LiquidFlow/LiquidFlowProcess.h
index 38acf770fe0..21259b69d04 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowProcess.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.h
@@ -106,5 +106,5 @@ private:
         _local_assemblers;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace LiquidFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/LocalAssemblerTraits.h b/ProcessLib/LocalAssemblerTraits.h
index 29b4f743f52..533449d4900 100644
--- a/ProcessLib/LocalAssemblerTraits.h
+++ b/ProcessLib/LocalAssemblerTraits.h
@@ -233,4 +233,4 @@ static_assert(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_FLAG == 1,
         " Maybe you forgot to include some header file.");
 #endif
 
-}
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/ConstantParameter.cpp b/ProcessLib/Parameter/ConstantParameter.cpp
index 5361c27c402..018b2ad07f6 100644
--- a/ProcessLib/Parameter/ConstantParameter.cpp
+++ b/ProcessLib/Parameter/ConstantParameter.cpp
@@ -60,4 +60,4 @@ std::unique_ptr<ParameterBase> createConstantParameter(
     return std::make_unique<ConstantParameter<double>>(name, values);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/ConstantParameter.h b/ProcessLib/Parameter/ConstantParameter.h
index 1e62a24c9ad..75a3f1adbea 100644
--- a/ProcessLib/Parameter/ConstantParameter.h
+++ b/ProcessLib/Parameter/ConstantParameter.h
@@ -71,4 +71,4 @@ private:
 std::unique_ptr<ParameterBase> createConstantParameter(
     std::string const& name, BaseLib::ConfigTree const& config);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/CurveScaledParameter.cpp b/ProcessLib/Parameter/CurveScaledParameter.cpp
index 25a5d0e116c..a73b48e365f 100644
--- a/ProcessLib/Parameter/CurveScaledParameter.cpp
+++ b/ProcessLib/Parameter/CurveScaledParameter.cpp
@@ -40,4 +40,4 @@ std::unique_ptr<ParameterBase> createCurveScaledParameter(
         name, *curve_it->second, referenced_parameter_name);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/CurveScaledParameter.h b/ProcessLib/Parameter/CurveScaledParameter.h
index 93441d29873..3e4babb0304 100644
--- a/ProcessLib/Parameter/CurveScaledParameter.h
+++ b/ProcessLib/Parameter/CurveScaledParameter.h
@@ -70,4 +70,4 @@ std::unique_ptr<ParameterBase> createCurveScaledParameter(
              std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const&
         curves);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/FunctionParameter.cpp b/ProcessLib/Parameter/FunctionParameter.cpp
index d5f88b07143..2a943202e54 100644
--- a/ProcessLib/Parameter/FunctionParameter.cpp
+++ b/ProcessLib/Parameter/FunctionParameter.cpp
@@ -34,4 +34,4 @@ std::unique_ptr<ParameterBase> createFunctionParameter(
         name, mesh, vec_expressions);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/FunctionParameter.h b/ProcessLib/Parameter/FunctionParameter.h
index a30ee3b10df..e90f998362f 100644
--- a/ProcessLib/Parameter/FunctionParameter.h
+++ b/ProcessLib/Parameter/FunctionParameter.h
@@ -113,4 +113,4 @@ std::unique_ptr<ParameterBase> createFunctionParameter(
     std::string const& name, BaseLib::ConfigTree const& config,
     MeshLib::Mesh const& mesh);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/GroupBasedParameter.cpp b/ProcessLib/Parameter/GroupBasedParameter.cpp
index dd589f82a11..d4eea5abf4c 100644
--- a/ProcessLib/Parameter/GroupBasedParameter.cpp
+++ b/ProcessLib/Parameter/GroupBasedParameter.cpp
@@ -95,4 +95,4 @@ std::unique_ptr<ParameterBase> createGroupBasedParameter(
     OGS_FATAL("Mesh item type of the specified property is not supported.");
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/GroupBasedParameter.h b/ProcessLib/Parameter/GroupBasedParameter.h
index 092a11e704a..86a51e7cfd9 100644
--- a/ProcessLib/Parameter/GroupBasedParameter.h
+++ b/ProcessLib/Parameter/GroupBasedParameter.h
@@ -94,4 +94,4 @@ std::unique_ptr<ParameterBase> createGroupBasedParameter(
     BaseLib::ConfigTree const& config,
     MeshLib::Mesh const& mesh);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/MeshElementParameter.cpp b/ProcessLib/Parameter/MeshElementParameter.cpp
index 22c1dd88d6c..aaa20760daa 100644
--- a/ProcessLib/Parameter/MeshElementParameter.cpp
+++ b/ProcessLib/Parameter/MeshElementParameter.cpp
@@ -35,4 +35,4 @@ std::unique_ptr<ParameterBase> createMeshElementParameter(
     return std::make_unique<MeshElementParameter<double>>(name, *property);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/MeshElementParameter.h b/ProcessLib/Parameter/MeshElementParameter.h
index 9bb6de3e92c..1146105622d 100644
--- a/ProcessLib/Parameter/MeshElementParameter.h
+++ b/ProcessLib/Parameter/MeshElementParameter.h
@@ -84,4 +84,4 @@ std::unique_ptr<ParameterBase> createMeshElementParameter(
     std::string const& name, BaseLib::ConfigTree const& config,
     MeshLib::Mesh const& mesh);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/MeshNodeParameter.cpp b/ProcessLib/Parameter/MeshNodeParameter.cpp
index b86295f5896..48fc8f5a281 100644
--- a/ProcessLib/Parameter/MeshNodeParameter.cpp
+++ b/ProcessLib/Parameter/MeshNodeParameter.cpp
@@ -35,4 +35,4 @@ std::unique_ptr<ParameterBase> createMeshNodeParameter(
     return std::make_unique<MeshNodeParameter<double>>(name, *property);
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/MeshNodeParameter.h b/ProcessLib/Parameter/MeshNodeParameter.h
index bda0426bda4..5c013c22dcf 100644
--- a/ProcessLib/Parameter/MeshNodeParameter.h
+++ b/ProcessLib/Parameter/MeshNodeParameter.h
@@ -88,4 +88,4 @@ std::unique_ptr<ParameterBase> createMeshNodeParameter(
     std::string const& name, BaseLib::ConfigTree const& config,
     MeshLib::Mesh const& mesh);
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/Parameter.cpp b/ProcessLib/Parameter/Parameter.cpp
index 0061e4ab436..8d21a617f5c 100644
--- a/ProcessLib/Parameter/Parameter.cpp
+++ b/ProcessLib/Parameter/Parameter.cpp
@@ -74,4 +74,4 @@ std::unique_ptr<ParameterBase> createParameter(
     OGS_FATAL("Cannot construct a parameter of given type '%s'.", type.c_str());
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Parameter/SpatialPosition.h b/ProcessLib/Parameter/SpatialPosition.h
index f3366a4c19c..30a87e09733 100644
--- a/ProcessLib/Parameter/SpatialPosition.h
+++ b/ProcessLib/Parameter/SpatialPosition.h
@@ -86,4 +86,4 @@ private:
     boost::optional<MathLib::TemplatePoint<double, 3>> _coordinates;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp b/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp
index abd0b04373e..5e9a684bdf5 100644
--- a/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp
+++ b/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp
@@ -111,5 +111,5 @@ PorousMediaProperties createPorousMediaProperties(
                                  std::move(material_ids)};
 }
 
-}  // namespace ComponentTransport
+}  // namespace RichardsComponentTransport
 }  // namespace ProcessLib
diff --git a/ProcessLib/RichardsComponentTransport/PorousMediaProperties.cpp b/ProcessLib/RichardsComponentTransport/PorousMediaProperties.cpp
index 941d2b74792..042d0237a99 100644
--- a/ProcessLib/RichardsComponentTransport/PorousMediaProperties.cpp
+++ b/ProcessLib/RichardsComponentTransport/PorousMediaProperties.cpp
@@ -54,5 +54,5 @@ PorousMediaProperties::getRelativePermeability(
 {
     return *_relative_permeability_models[getMaterialID(pos)];
 }
-}
-}
+}  // namespace RichardsComponentTransport
+}  // namespace ProcessLib
diff --git a/ProcessLib/RichardsComponentTransport/PorousMediaProperties.h b/ProcessLib/RichardsComponentTransport/PorousMediaProperties.h
index 30b773a7f98..1abc5850bed 100644
--- a/ProcessLib/RichardsComponentTransport/PorousMediaProperties.h
+++ b/ProcessLib/RichardsComponentTransport/PorousMediaProperties.h
@@ -104,5 +104,5 @@ private:
     std::vector<int> _material_ids;
 };
 
-}
-}
+}  // namespace RichardsComponentTransport
+}  // namespace ProcessLib
diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.cpp b/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.cpp
index 609c88518dc..4bed8c3f514 100644
--- a/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.cpp
+++ b/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.cpp
@@ -114,5 +114,5 @@ createRichardsFlowMaterialProperties(
             std::move(relative_permeability_models)}};
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace RichardsFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.h b/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.h
index 7e91a36e5a9..20731abc377 100644
--- a/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.h
+++ b/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.h
@@ -26,4 +26,4 @@ createRichardsFlowMaterialProperties(
     std::vector<std::unique_ptr<ParameterBase>> const& parameters);
 
 }  // end namespace
-}  // end namespace
+}  // namespace ProcessLib
diff --git a/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.cpp b/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.cpp
index 94e78cce43f..7d2a6f268eb 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.cpp
+++ b/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.cpp
@@ -155,5 +155,5 @@ double RichardsFlowMaterialProperties::getSaturationDerivative2(
         _capillary_pressure_models[material_id]->getd2PcdS2(saturation);
     return -d2pcdsw2 / boost::math::pow<3>(dpcdsw);
 }
-}  // end of namespace
-}  // end of namespace
+}  // namespace RichardsFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.h b/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.h
index a9a4143417b..c75561c3811 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.h
+++ b/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.h
@@ -127,5 +127,5 @@ private:
         _relative_permeability_models;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace RichardsFlow
+}  // namespace ProcessLib
diff --git a/ProcessLib/SmallDeformation/CreateLocalAssemblers.h b/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
index 84bd037a408..4c13e909d0b 100644
--- a/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
+++ b/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
@@ -79,6 +79,6 @@ void createLocalAssemblers(
         dof_table, mesh_elements, local_assemblers,
         std::forward<ExtraCtorArgs>(extra_ctor_args)...);
 }
-}  // SmallDeformation
+}  // namespace SmallDeformation
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/SourceTerms/SourceTermCollection.cpp b/ProcessLib/SourceTerms/SourceTermCollection.cpp
index d7678b3f751..83622d076b6 100644
--- a/ProcessLib/SourceTerms/SourceTermCollection.cpp
+++ b/ProcessLib/SourceTerms/SourceTermCollection.cpp
@@ -36,4 +36,4 @@ void SourceTermCollection::integrate(const double t, GlobalVector const& x,
         st->integrate(t, x, b, jac);
 }
 
-}
+}  // namespace ProcessLib
diff --git a/ProcessLib/SourceTerms/SourceTermCollection.h b/ProcessLib/SourceTerms/SourceTermCollection.h
index be718426a48..7de8a0747fc 100644
--- a/ProcessLib/SourceTerms/SourceTermCollection.h
+++ b/ProcessLib/SourceTerms/SourceTermCollection.h
@@ -37,4 +37,4 @@ private:
     std::vector<std::unique_ptr<ParameterBase>> const& _parameters;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/SourceTerms/SourceTermConfig.h b/ProcessLib/SourceTerms/SourceTermConfig.h
index 9c7b85fb93e..5d85f55f8e5 100644
--- a/ProcessLib/SourceTerms/SourceTermConfig.h
+++ b/ProcessLib/SourceTerms/SourceTermConfig.h
@@ -35,4 +35,4 @@ struct SourceTermConfig final
     boost::optional<int> const component_id;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h b/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
index 2f17377a48a..c4e1aa2a7ad 100644
--- a/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
+++ b/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
@@ -170,4 +170,4 @@ private:
     std::size_t _bulk_face_id;
 };
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/TES/TESLocalAssemblerData.cpp b/ProcessLib/TES/TESLocalAssemblerData.cpp
index 02e3137557c..5592c1c281f 100644
--- a/ProcessLib/TES/TESLocalAssemblerData.cpp
+++ b/ProcessLib/TES/TESLocalAssemblerData.cpp
@@ -27,5 +27,5 @@ TESLocalAssemblerData::TESLocalAssemblerData(AssemblyParams const& ap_,
 }
 
 TESLocalAssemblerData::~TESLocalAssemblerData() = default;
-}
-}  // namespaces
+}  // namespace TES
+}  // namespace ProcessLib
diff --git a/ProcessLib/TES/TESLocalAssemblerData.h b/ProcessLib/TES/TESLocalAssemblerData.h
index b8b2e72aecf..ac565513483 100644
--- a/ProcessLib/TES/TESLocalAssemblerData.h
+++ b/ProcessLib/TES/TESLocalAssemblerData.h
@@ -53,5 +53,5 @@ struct TESLocalAssemblerData
     std::vector<double> reaction_rate_prev_ts;  // could also be calculated from
                                                 // solid_density_prev_ts
 };
-}
-}  // namespaces
+}  // namespace TES
+}  // namespace ProcessLib
diff --git a/ProcessLib/TES/TESLocalAssemblerInner-fwd.h b/ProcessLib/TES/TESLocalAssemblerInner-fwd.h
index dadc2e7f6aa..f7e20ed410b 100644
--- a/ProcessLib/TES/TESLocalAssemblerInner-fwd.h
+++ b/ProcessLib/TES/TESLocalAssemblerInner-fwd.h
@@ -26,5 +26,5 @@ static_assert(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_FLAG == 1,
 static_assert(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_FLAG == 0,
               "inconsistent use of macros");
 #endif
-}
-}
+}  // namespace TES
+}  // namespace ProcessLib
diff --git a/ProcessLib/TES/TESLocalAssemblerInner.cpp b/ProcessLib/TES/TESLocalAssemblerInner.cpp
index 5792be92610..6a832386623 100644
--- a/ProcessLib/TES/TESLocalAssemblerInner.cpp
+++ b/ProcessLib/TES/TESLocalAssemblerInner.cpp
@@ -31,5 +31,5 @@ static_assert(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_FLAG == 1,
 static_assert(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_FLAG == 0,
               "inconsistent use of macros");
 #endif
-}
-}
+}  // namespace TES
+}  // namespace ProcessLib
diff --git a/ProcessLib/TES/TESOGS5MaterialModels.cpp b/ProcessLib/TES/TESOGS5MaterialModels.cpp
index b8098f829e4..c6476cb4c57 100644
--- a/ProcessLib/TES/TESOGS5MaterialModels.cpp
+++ b/ProcessLib/TES/TESOGS5MaterialModels.cpp
@@ -31,5 +31,5 @@ const double FluidViscosityN2::C[5] = {-20.09997, 3.4376416, -1.4470051,
 const double FluidHeatConductivityH2O::a[4] = {0.0102811, 0.0299621, 0.0156146,
                                                -0.00422464};
 
-}  // TES
-}  // ProcessLib
+}  // namespace TES
+}  // namespace ProcessLib
diff --git a/ProcessLib/TES/TESOGS5MaterialModels.h b/ProcessLib/TES/TESOGS5MaterialModels.h
index feeaf98d04c..19bded3c007 100644
--- a/ProcessLib/TES/TESOGS5MaterialModels.h
+++ b/ProcessLib/TES/TESOGS5MaterialModels.h
@@ -399,5 +399,5 @@ inline double fluid_heat_conductivity(const double p,
     return k0 * x0 / (x0 + x1 * phi_12) + k1 * x1 / (x1 + x0 * phi_21);
 }
 
-}  // TES
-}  // ProcessLib
+}  // namespace TES
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp
index bc503cf6944..66c73326055 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp
@@ -102,5 +102,5 @@ createThermalTwoPhaseFlowWithPPMaterialProperties(
         std::move(vapor_property));
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.h
index c4c4c47d82c..e51387b61b7 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.h
@@ -34,4 +34,4 @@ createThermalTwoPhaseFlowWithPPMaterialProperties(
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
 
 }  // end namespace
-}  // end namespace
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp
index 46c5e5f0cb9..42ad27fc796 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp
@@ -141,5 +141,5 @@ std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess(
         mat_config, curves);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h
index b8bc0238133..bb93b33d64e 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h
@@ -27,5 +27,5 @@ std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess(
     std::map<std::string,
              std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const&
         curves);
-}  // end of namespace
-}  // end of namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h
index 7ad7932f9f3..27c39c433f3 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h
@@ -466,5 +466,5 @@ void ThermalTwoPhaseFlowWithPPLocalAssembler<
     }  // end of mass-lumping
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler.h
index 56dacfe2ddd..e20b9b761bb 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPLocalAssembler.h
@@ -190,7 +190,7 @@ private:
     static const int temperature_size = ShapeFunction::NPOINTS;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
 
 #include "ThermalTwoPhaseFlowWithPPLocalAssembler-impl.h"
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.cpp
index dedf9f7a95c..52e4dc7d8a9 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.cpp
@@ -204,5 +204,5 @@ ThermalTwoPhaseFlowWithPPMaterialProperties::getLiquidWaterEnthalpySimple(
     return heat_capacity_liquid_water * (temperature - CelsiusZeroInKelvin);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.h
index 7bdd9de80f1..91469113e1a 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.h
@@ -143,5 +143,5 @@ private:
         _water_vapor_properties;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
index c47f5e5d6c8..a89fa3b1920 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
@@ -124,5 +124,5 @@ void ThermalTwoPhaseFlowWithPPProcess::preTimestepConcreteProcess(
         delta_t);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
index ea4be1ea661..d4aeb57f12b 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
@@ -78,5 +78,5 @@ private:
         _local_assemblers;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace ThermalTwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcessData.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcessData.h
index d138a24857b..fce7cd75647 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcessData.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcessData.h
@@ -75,5 +75,5 @@ struct ThermalTwoPhaseFlowWithPPProcessData
     std::unique_ptr<ThermalTwoPhaseFlowWithPPMaterialProperties> material;
 };
 
-}  // namespace TwoPhaseFlowWithPP
+}  // namespace ThermalTwoPhaseFlowWithPP
 }  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPMaterialProperties.cpp b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPMaterialProperties.cpp
index acae56e36cf..990d7e062a9 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPMaterialProperties.cpp
@@ -135,5 +135,5 @@ createTwoPhaseFlowWithPPMaterialProperties(
         std::move(relative_permeability_models));
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPMaterialProperties.h b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPMaterialProperties.h
index 27f262c11ed..4c76a9c9f18 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPMaterialProperties.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPMaterialProperties.h
@@ -27,4 +27,4 @@ createTwoPhaseFlowWithPPMaterialProperties(
     std::vector<std::unique_ptr<ParameterBase>> const& parameters);
 
 }  // end namespace
-}  // end namespace
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp
index 2cde552489d..e39c4e559e0 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp
@@ -101,5 +101,5 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess(
         mat_config, curves);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h
index 015745d9e31..b54f71fc9fe 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h
@@ -26,5 +26,5 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess(
     std::map<std::string,
              std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const&
         curves);
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler-impl.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler-impl.h
index d350d5ac6ec..b8afab6c800 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler-impl.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler-impl.h
@@ -203,5 +203,5 @@ void TwoPhaseFlowWithPPLocalAssembler<
     }  // end of mass-lumping
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h
index 3ccb6e15a09..1a8803d8c2e 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPLocalAssembler.h
@@ -189,7 +189,7 @@ private:
     static const int cap_pressure_size = ShapeFunction::NPOINTS;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
 
 #include "TwoPhaseFlowWithPPLocalAssembler-impl.h"
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.cpp b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.cpp
index 4a4cfefd30a..d3bbc9dae0e 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.cpp
@@ -166,5 +166,5 @@ double TwoPhaseFlowWithPPMaterialProperties::getSaturationDerivative(
         _capillary_pressure_models[material_id]->getdPcdS(saturation);
     return 1 / dpcdsw;
 }
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.h
index 2116128350e..cbb231317b0 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.h
@@ -126,5 +126,5 @@ protected:
         _relative_permeability_models;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
index 4d8ce27151b..fef16fc7939 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
@@ -109,5 +109,5 @@ void TwoPhaseFlowWithPPProcess::assembleWithJacobianConcreteProcess(
         xdot, dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
index 72fa5ea548a..aa02ffce5b1 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
@@ -72,5 +72,5 @@ private:
         _local_assemblers;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPP
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.cpp b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.cpp
index f91e3f2e0af..92169a8af86 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.cpp
@@ -136,5 +136,5 @@ createTwoPhaseFlowPrhoMaterialProperties(
         std::move(_relative_permeability_models));
 }
 
-}  // end namespace
-}  // end namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.h b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.h
index 3e6941e86f8..e1091706484 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.h
@@ -27,4 +27,4 @@ createTwoPhaseFlowPrhoMaterialProperties(
     std::vector<std::unique_ptr<ParameterBase>> const& parameters);
 
 }  // end namespace
-}  // end namespace
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp
index 80334f77914..14a64c323b3 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp
@@ -114,5 +114,5 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess(
         mat_config, curves);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h
index b4a338c2364..a3bae4de32f 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h
@@ -26,5 +26,5 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess(
     std::map<std::string,
              std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const&
         curves);
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler-impl.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler-impl.h
index 62f5c7e1500..16c72c1050b 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler-impl.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler-impl.h
@@ -228,5 +228,5 @@ void TwoPhaseFlowWithPrhoLocalAssembler<
     }  // end of mass-lumping
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
index ece7fb47815..bcadbaa67ea 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
@@ -189,7 +189,7 @@ private:
     static const int cap_pressure_size = ShapeFunction::NPOINTS;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
 
 #include "TwoPhaseFlowWithPrhoLocalAssembler-impl.h"
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.cpp
index 12d80a3cd60..3af15e53b8a 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.cpp
@@ -383,5 +383,5 @@ double TwoPhaseFlowWithPrhoMaterialProperties::calculatedXmdP(
         return 0.0;
     return HenryConstantH2 * H2 * (1 + dPC_dSw * dSwdP);
 }
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h
index 4493e087784..855bf123db4 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h
@@ -188,5 +188,5 @@ private:
                           int current_material_id) const;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
index 2560399bf10..c7edce15016 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
@@ -122,5 +122,5 @@ void TwoPhaseFlowWithPrhoProcess::preTimestepConcreteProcess(
         dt);
 }
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
index 54f49a23527..a21372a31a1 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
@@ -73,5 +73,5 @@ private:
         _local_assemblers;
 };
 
-}  // end of namespace
-}  // end of namespace
+}  // namespace TwoPhaseFlowWithPrho
+}  // namespace ProcessLib
diff --git a/ProcessLib/Utils/CreateLocalAssemblers.h b/ProcessLib/Utils/CreateLocalAssemblers.h
index 6669366fdc1..e73de6b710b 100644
--- a/ProcessLib/Utils/CreateLocalAssemblers.h
+++ b/ProcessLib/Utils/CreateLocalAssemblers.h
@@ -99,4 +99,4 @@ void createLocalAssemblers(
     }
 }
 
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Utils/InitShapeMatrices.h b/ProcessLib/Utils/InitShapeMatrices.h
index 875bd01ef86..10228ee919e 100644
--- a/ProcessLib/Utils/InitShapeMatrices.h
+++ b/ProcessLib/Utils/InitShapeMatrices.h
@@ -60,4 +60,4 @@ double interpolateXCoordinate(
     return fe.interpolateZerothCoordinate(N);
 }
 
-} // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/Utils/ProcessUtils.h b/ProcessLib/Utils/ProcessUtils.h
index 11199ccc7e6..db0c8025647 100644
--- a/ProcessLib/Utils/ProcessUtils.h
+++ b/ProcessLib/Utils/ProcessUtils.h
@@ -124,4 +124,4 @@ Parameter<ParameterDataType>& findParameter(
 
     return findParameter<ParameterDataType>(name, parameters, num_components);
 }
-}  // ProcessLib
+}  // namespace ProcessLib
diff --git a/ProcessLib/VariableTransformation.h b/ProcessLib/VariableTransformation.h
index 5e652cf6919..2f00a1d20f9 100644
--- a/ProcessLib/VariableTransformation.h
+++ b/ProcessLib/VariableTransformation.h
@@ -84,4 +84,4 @@ private:
 };
 
 using Trafo = ProcessLib::TrafoScale;
-}
+}  // namespace ProcessLib
diff --git a/Tests/AutoCheckTools.h b/Tests/AutoCheckTools.h
index 5121a6867e1..1b121bf50c7 100644
--- a/Tests/AutoCheckTools.h
+++ b/Tests/AutoCheckTools.h
@@ -27,7 +27,7 @@ std::ostream& operator<<(std::ostream& os, std::array<T, N> const& array)
     os << "]";
     return os;
 }
-}
+}  // namespace std
 
 namespace autocheck
 {
diff --git a/Tests/MeshLib/TestAddLayerToMesh.cpp b/Tests/MeshLib/TestAddLayerToMesh.cpp
index e62788d41a3..048039aa0a6 100644
--- a/Tests/MeshLib/TestAddLayerToMesh.cpp
+++ b/Tests/MeshLib/TestAddLayerToMesh.cpp
@@ -53,7 +53,7 @@ namespace AddLayerValidation
         for (std::size_t i=0; i<nNodes; ++i)
             ASSERT_EQ((*input.getNode(i))[2] + height, (*output.getNode(i))[2]);
     }
-};
+    }  // namespace AddLayerValidation
 
 TEST(MeshLib, AddTopLayerToLineMesh)
 {
diff --git a/Tests/MeshLib/TestCoordinatesMappingLocal.cpp b/Tests/MeshLib/TestCoordinatesMappingLocal.cpp
index 95502a1f277..c69faf423e0 100644
--- a/Tests/MeshLib/TestCoordinatesMappingLocal.cpp
+++ b/Tests/MeshLib/TestCoordinatesMappingLocal.cpp
@@ -67,7 +67,7 @@ std::unique_ptr<MeshLib::Line> createLine(std::array<double, 3> const& a,
         return createLine({{0.0, 0.0, 0.0}}, {{2./sqrt(3), 2./sqrt(3), 2./sqrt(3)}});
     }
 
-};
+    }  // namespace TestLine2
 
 namespace TestQuad4
 {
@@ -118,7 +118,7 @@ std::unique_ptr<MeshLib::Quad> createQuad(std::array<double, 3> const& a,
             {{0.0, -1.0, -1.0}},
             {{0.0,  1.0, -1.0}});
     }
-};
+    }  // namespace TestQuad4
 
 #if 0
 // keep this function for debugging
diff --git a/Tests/NumLib/CoordinatesMappingTestData/TestHex8.h b/Tests/NumLib/CoordinatesMappingTestData/TestHex8.h
index fe375c29d75..f3a1c67c712 100644
--- a/Tests/NumLib/CoordinatesMappingTestData/TestHex8.h
+++ b/Tests/NumLib/CoordinatesMappingTestData/TestHex8.h
@@ -119,4 +119,4 @@ const double TestHex8::cl_exp_J[dim*dim] = {0.0, 1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0
 const double TestHex8::cl_exp_detJ = -1.;
 const double TestHex8::ze_exp_J[dim*dim] = {1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0};
 
-}
+}  // namespace CoordinatesMappingTestData
diff --git a/Tests/NumLib/CoordinatesMappingTestData/TestLine2.h b/Tests/NumLib/CoordinatesMappingTestData/TestLine2.h
index f0ca7ce94d9..eb896fa5037 100644
--- a/Tests/NumLib/CoordinatesMappingTestData/TestLine2.h
+++ b/Tests/NumLib/CoordinatesMappingTestData/TestLine2.h
@@ -97,4 +97,4 @@ const double TestLine2::cl_exp_J[dim*dim] = {-1.};
 const double TestLine2::cl_exp_detJ = -1;
 const double TestLine2::ze_exp_J[dim*dim] = {0.0};
 
-}
+}  // namespace CoordinatesMappingTestData
diff --git a/Tests/NumLib/CoordinatesMappingTestData/TestLine3.h b/Tests/NumLib/CoordinatesMappingTestData/TestLine3.h
index 4e05d64656b..dba98fbdd65 100644
--- a/Tests/NumLib/CoordinatesMappingTestData/TestLine3.h
+++ b/Tests/NumLib/CoordinatesMappingTestData/TestLine3.h
@@ -100,4 +100,4 @@ const double TestLine3::ir_exp_dNdx[dim * e_nnodes] = {0, 0.5, -0.5};
 const double TestLine3::cl_exp_J[dim * dim] = {-1.};
 const double TestLine3::cl_exp_detJ = -1;
 const double TestLine3::ze_exp_J[dim * dim] = {0.0};
-}
+}  // namespace CoordinatesMappingTestData
diff --git a/Tests/NumLib/CoordinatesMappingTestData/TestQuad4.h b/Tests/NumLib/CoordinatesMappingTestData/TestQuad4.h
index 336594fa0aa..eba1c523d78 100644
--- a/Tests/NumLib/CoordinatesMappingTestData/TestQuad4.h
+++ b/Tests/NumLib/CoordinatesMappingTestData/TestQuad4.h
@@ -99,4 +99,4 @@ const double TestQuad4::cl_exp_J[dim*dim] = {0.0, 1.0, 1.0, 0.0};
 const double TestQuad4::cl_exp_detJ = -1.;
 const double TestQuad4::ze_exp_J[dim*dim] = {1.0, 0.0, 0.0, 0.0};
 
-}
+}  // namespace CoordinatesMappingTestData
diff --git a/Tests/NumLib/CoordinatesMappingTestData/TestTri3.h b/Tests/NumLib/CoordinatesMappingTestData/TestTri3.h
index c8440a1e5e7..ebe8b120ed8 100644
--- a/Tests/NumLib/CoordinatesMappingTestData/TestTri3.h
+++ b/Tests/NumLib/CoordinatesMappingTestData/TestTri3.h
@@ -94,4 +94,4 @@ const double TestTri3::cl_exp_J[dim*dim] = {0.0, 1.0, 1.0, 0.0};
 const double TestTri3::cl_exp_detJ = -1.;
 const double TestTri3::ze_exp_J[dim*dim] = {1.0, 0.0, 1.0, 0.0};
 
-}
+}  // namespace CoordinatesMappingTestData
diff --git a/Tests/NumLib/FeTestData/MatrixTools.h b/Tests/NumLib/FeTestData/MatrixTools.h
index 15a2efcabef..40ab6b11365 100644
--- a/Tests/NumLib/FeTestData/MatrixTools.h
+++ b/Tests/NumLib/FeTestData/MatrixTools.h
@@ -32,4 +32,4 @@ inline void setIdentityMatrix(unsigned dim, T_MATRIX &m)
         m(i,i) = 1.0;
 }
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeHEX20.h b/Tests/NumLib/FeTestData/TestFeHEX20.h
index 8684e285eab..23d5d791d97 100644
--- a/Tests/NumLib/FeTestData/TestFeHEX20.h
+++ b/Tests/NumLib/FeTestData/TestFeHEX20.h
@@ -71,4 +71,4 @@ public:
     double getVolume() const { return 1.0; }
 };
 
-}  // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeHEX8.h b/Tests/NumLib/FeTestData/TestFeHEX8.h
index 446fcb7d641..027b1863a36 100644
--- a/Tests/NumLib/FeTestData/TestFeHEX8.h
+++ b/Tests/NumLib/FeTestData/TestFeHEX8.h
@@ -89,4 +89,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeLINE2.h b/Tests/NumLib/FeTestData/TestFeLINE2.h
index c7e4c835e7c..3eb8460b42f 100644
--- a/Tests/NumLib/FeTestData/TestFeLINE2.h
+++ b/Tests/NumLib/FeTestData/TestFeLINE2.h
@@ -69,4 +69,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeLINE2Y.h b/Tests/NumLib/FeTestData/TestFeLINE2Y.h
index 91d024489ac..1f60bf89edd 100644
--- a/Tests/NumLib/FeTestData/TestFeLINE2Y.h
+++ b/Tests/NumLib/FeTestData/TestFeLINE2Y.h
@@ -68,4 +68,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeLINE3.h b/Tests/NumLib/FeTestData/TestFeLINE3.h
index 0264551d828..a9c410e33c4 100644
--- a/Tests/NumLib/FeTestData/TestFeLINE3.h
+++ b/Tests/NumLib/FeTestData/TestFeLINE3.h
@@ -71,4 +71,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFePRISM15.h b/Tests/NumLib/FeTestData/TestFePRISM15.h
index 510be3dc9ef..a9f68e09127 100644
--- a/Tests/NumLib/FeTestData/TestFePRISM15.h
+++ b/Tests/NumLib/FeTestData/TestFePRISM15.h
@@ -67,4 +67,4 @@ public:
     double getVolume() const { return 0.0625; }
 };
 
-}  // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFePRISM6.h b/Tests/NumLib/FeTestData/TestFePRISM6.h
index 2d55a1bb3e1..dd888b0f221 100644
--- a/Tests/NumLib/FeTestData/TestFePRISM6.h
+++ b/Tests/NumLib/FeTestData/TestFePRISM6.h
@@ -82,4 +82,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFePYRA13.h b/Tests/NumLib/FeTestData/TestFePYRA13.h
index b782cf442fe..789c4c171c7 100644
--- a/Tests/NumLib/FeTestData/TestFePYRA13.h
+++ b/Tests/NumLib/FeTestData/TestFePYRA13.h
@@ -63,4 +63,4 @@ public:
     double getVolume() const { return 0.5 * 0.5 * 0.25 / 3.0; }
 };
 
-}  // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFePYRA5.h b/Tests/NumLib/FeTestData/TestFePYRA5.h
index dbb8aa29d5a..48fb323a8c6 100644
--- a/Tests/NumLib/FeTestData/TestFePYRA5.h
+++ b/Tests/NumLib/FeTestData/TestFePYRA5.h
@@ -78,4 +78,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeQUAD4.h b/Tests/NumLib/FeTestData/TestFeQUAD4.h
index b6f44cc8796..21f43b1f644 100644
--- a/Tests/NumLib/FeTestData/TestFeQUAD4.h
+++ b/Tests/NumLib/FeTestData/TestFeQUAD4.h
@@ -77,4 +77,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeQUAD8.h b/Tests/NumLib/FeTestData/TestFeQUAD8.h
index 23cec38b663..3833def5131 100644
--- a/Tests/NumLib/FeTestData/TestFeQUAD8.h
+++ b/Tests/NumLib/FeTestData/TestFeQUAD8.h
@@ -67,4 +67,4 @@ public:
     }
 };
 
-}  // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeQUAD9.h b/Tests/NumLib/FeTestData/TestFeQUAD9.h
index 0f09d390791..e1737ee7bd3 100644
--- a/Tests/NumLib/FeTestData/TestFeQUAD9.h
+++ b/Tests/NumLib/FeTestData/TestFeQUAD9.h
@@ -68,4 +68,4 @@ public:
     }
 };
 
-}  // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeTET10.h b/Tests/NumLib/FeTestData/TestFeTET10.h
index 07c8b053121..e6f50c56ea0 100644
--- a/Tests/NumLib/FeTestData/TestFeTET10.h
+++ b/Tests/NumLib/FeTestData/TestFeTET10.h
@@ -60,4 +60,4 @@ public:
     double getVolume() const { return 1.0 / 6.; }
 };
 
-}  // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeTET4.h b/Tests/NumLib/FeTestData/TestFeTET4.h
index bd4afad000f..ef9b9eeab49 100644
--- a/Tests/NumLib/FeTestData/TestFeTET4.h
+++ b/Tests/NumLib/FeTestData/TestFeTET4.h
@@ -75,4 +75,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeTRI3.h b/Tests/NumLib/FeTestData/TestFeTRI3.h
index 76a19f7f4fd..4c002b247fb 100644
--- a/Tests/NumLib/FeTestData/TestFeTRI3.h
+++ b/Tests/NumLib/FeTestData/TestFeTRI3.h
@@ -73,4 +73,4 @@ public:
     }
 };
 
-} // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/FeTestData/TestFeTRI6.h b/Tests/NumLib/FeTestData/TestFeTRI6.h
index d7335a8dbc8..edff402f176 100644
--- a/Tests/NumLib/FeTestData/TestFeTRI6.h
+++ b/Tests/NumLib/FeTestData/TestFeTRI6.h
@@ -74,4 +74,4 @@ public:
     }
 };
 
-}  // namespace
+}  // namespace FeTestData
diff --git a/Tests/NumLib/TestExtrapolation.cpp b/Tests/NumLib/TestExtrapolation.cpp
index 7b8f778525a..0f61a9e4c56 100644
--- a/Tests/NumLib/TestExtrapolation.cpp
+++ b/Tests/NumLib/TestExtrapolation.cpp
@@ -243,7 +243,7 @@ void extrapolate(ExtrapolationTestProcess const& pcs,
     EXPECT_GT(tolerance_dx, dx_norm);
 }
 
-}  // anonymous namespace
+}  // namespace ExtrapolationTest
 
 #ifndef USE_PETSC
 TEST(NumLib, Extrapolation)
diff --git a/Tests/NumLib/TestFe.cpp b/Tests/NumLib/TestFe.cpp
index 59ddcc0c164..130da6f5dfd 100644
--- a/Tests/NumLib/TestFe.cpp
+++ b/Tests/NumLib/TestFe.cpp
@@ -71,7 +71,7 @@ using TestTypes =
                      TestCase<TestFeQUAD4, EigenFixedShapeMatrixPolicy>,
                      TestCase<TestFeTET4, EigenFixedShapeMatrixPolicy>,
                      TestCase<TestFeTRI3, EigenFixedShapeMatrixPolicy>>;
-}
+}  // namespace
 
 template <class T>
 class NumLibFemIsoTest : public ::testing::Test, public T::TestFeType
diff --git a/Tests/NumLib/TestGradShapeFunction.cpp b/Tests/NumLib/TestGradShapeFunction.cpp
index 01c8bf2b607..a59f0c8cbd1 100644
--- a/Tests/NumLib/TestGradShapeFunction.cpp
+++ b/Tests/NumLib/TestGradShapeFunction.cpp
@@ -98,7 +98,7 @@ using TestTypes =
                      TestCase<TestFeTET10, EigenFixedShapeMatrixPolicy>,
                      TestCase<TestFeTRI3, EigenFixedShapeMatrixPolicy>,
                      TestCase<TestFeTRI6, EigenFixedShapeMatrixPolicy>>;
-}
+}  // namespace
 
 template <class T>
 class GradShapeFunctionTest : public ::testing::Test, public T::TestFeType
diff --git a/Tests/NumLib/TestShapeFunctions.cpp b/Tests/NumLib/TestShapeFunctions.cpp
index a4e3c586f25..029b09b3b98 100644
--- a/Tests/NumLib/TestShapeFunctions.cpp
+++ b/Tests/NumLib/TestShapeFunctions.cpp
@@ -83,7 +83,7 @@ struct NaturalPointGenerator
     }
 };
 
-}
+}  // namespace autocheck
 
 namespace ac = autocheck;
 using namespace NumLib;
diff --git a/Tests/ProcessLib/LIE/TestLIE.cpp b/Tests/ProcessLib/LIE/TestLIE.cpp
index eaef9e7883b..d27edb01f68 100644
--- a/Tests/ProcessLib/LIE/TestLIE.cpp
+++ b/Tests/ProcessLib/LIE/TestLIE.cpp
@@ -51,7 +51,7 @@ std::unique_ptr<MeshLib::Mesh> createLine(
 
 const double eps = std::numeric_limits<double>::epsilon();
 
-}
+}  // namespace
 
 TEST(LIE, rotationMatrixXYTriangle)
 {
-- 
GitLab