diff --git a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.h b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.h
index 7377af805833e0eff82cf09aeda5b1ddd5f06aeb..0dbd6a52f5f84cd90ed5d81e15e7aac99c34d22f 100644
--- a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.h
+++ b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.h
@@ -55,4 +55,4 @@ private:
     static void readPoints(QDomElement& nodesEle, const std::string& tag,
                            int dim, std::vector<GeoLib::Point*>& points);
 };
-}  // FileIO
+}  // namespace FileIO
diff --git a/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h
index f73d61707088d812862d8905161ead6dd56cf2c1..85bf27e4ad394e51d0fd84b01a94fcbbfa1c9546 100644
--- a/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h
+++ b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h
@@ -123,4 +123,4 @@ private:
         std::vector<MeshLib::Element*> const& vec_elements,
         std::vector<int>& material_ids);
 };
-}  // FileIO
+}  // namespace FileIO
diff --git a/Applications/FileIO/XmlIO/Qt/XmlLutReader.h b/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
index 521c40719a539377ef518b41592d3e6be453a3d7..c0a8ef4ec6d3530bc56e85f428980267e557fd9d 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
+++ b/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
@@ -99,4 +99,4 @@ public:
 
 };
 
- }
+}  // namespace FileIO
diff --git a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
index 339d77c49c00f3c24176a33476b2d9138206d3ff..2d4538ce40e70dbe96a1ec595b77f5f42551621d 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
+++ b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
@@ -41,4 +41,4 @@ protected:
     bool write() override;
 };
 
-}
+}  // namespace FileIO
diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
index 688743f7547cfcce416aa4ff39c857b78563a8b1..96769146e71886b28be4e1110f6bb246e5d1c1d5 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
+++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
@@ -71,4 +71,4 @@ private:
 };
 
 } // end namespace IO
-} // end namespace BaseLib
+}  // namespace GeoLib
diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
index 6f1d3bc69d4e93b3d23143d8011524dd0fdc7cf3..1c1a3bd1bb5e1b1e1b3da8b02fb36cc37a353030 100644
--- a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
+++ b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
@@ -35,5 +35,5 @@ createTwoPhaseFlowMaterialProperties(
     std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
         parameters);
 
-}  // end namespace
+}  // namespace TwoPhaseFlowWithPP
 }  // namespace MaterialLib
diff --git a/MeshLib/MeshQuality/ElementQualityInterface.h b/MeshLib/MeshQuality/ElementQualityInterface.h
index 83fe3d12aca64c679086ff283ccd8816aaebf9a3..8ea1ecdd37520047ea0219c573440d4e217c47e5 100644
--- a/MeshLib/MeshQuality/ElementQualityInterface.h
+++ b/MeshLib/MeshQuality/ElementQualityInterface.h
@@ -106,4 +106,4 @@ private:
     MeshLib::ElementQualityMetric* _quality_tester;
 };
 
-}
+}  // namespace MeshLib
diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h
index b92aac81a48c7eed7691a42de8984e3b7a8fbf1e..e4575df5fb24c59d8229959c9cba25c41c3d1395 100644
--- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h
+++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h
@@ -27,5 +27,5 @@ std::unique_ptr<Process> createLiquidFlowProcess(
     std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
     unsigned const integration_order,
     BaseLib::ConfigTree const& config);
-}  // end of namespace
+}  // namespace LiquidFlow
 }  // namespace ProcessLib
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.h b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.h
index 976276ae2b5deccbf4a5b7dd71e37ad50ab724c7..5899879bca0f04793d594d9e796404f3fa736469 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.h
@@ -28,5 +28,5 @@ createTwoPhaseFlowPrhoMaterialProperties(
     std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
         parameters);
 
-}  // end namespace
+}  // namespace TwoPhaseFlowWithPrho
 }  // namespace ProcessLib