diff --git a/bullet/src/Base.hh b/bullet/src/Base.hh
index dbda0c682..14ac2c57e 100644
--- a/bullet/src/Base.hh
+++ b/bullet/src/Base.hh
@@ -192,8 +192,8 @@ class Base : public Implements3d<FeatureList<Feature>>
   public: std::unordered_map<std::size_t, JointInfoPtr> joints;
 };
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
 
 #endif
diff --git a/bullet/src/EntityManagementFeatures.cc b/bullet/src/EntityManagementFeatures.cc
index 7c599f6b9..079c7d29e 100644
--- a/bullet/src/EntityManagementFeatures.cc
+++ b/bullet/src/EntityManagementFeatures.cc
@@ -217,6 +217,6 @@ bool EntityManagementFeatures::RemoveModelByName(
   return false;
 }
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
diff --git a/bullet/src/EntityManagementFeatures.hh b/bullet/src/EntityManagementFeatures.hh
index 6176c9493..7a205ef6c 100644
--- a/bullet/src/EntityManagementFeatures.hh
+++ b/bullet/src/EntityManagementFeatures.hh
@@ -58,8 +58,8 @@ class EntityManagementFeatures :
       const Identity &/*_engineID*/, const std::string &/* _name */) override;
 };
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
 
 #endif
diff --git a/bullet/src/FreeGroupFeatures.cc b/bullet/src/FreeGroupFeatures.cc
index 8aff5c307..e1fa60621 100644
--- a/bullet/src/FreeGroupFeatures.cc
+++ b/bullet/src/FreeGroupFeatures.cc
@@ -79,6 +79,6 @@ void FreeGroupFeatures::SetFreeGroupWorldPose(
   }
 }
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
diff --git a/bullet/src/FreeGroupFeatures.hh b/bullet/src/FreeGroupFeatures.hh
index 250494f24..11fd9be8c 100644
--- a/bullet/src/FreeGroupFeatures.hh
+++ b/bullet/src/FreeGroupFeatures.hh
@@ -48,8 +48,8 @@ class FreeGroupFeatures
       const PoseType &_pose) override;
 };
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
 
 #endif
diff --git a/bullet/src/JointFeatures.cc b/bullet/src/JointFeatures.cc
index d1e25bec5..2e78e398c 100644
--- a/bullet/src/JointFeatures.cc
+++ b/bullet/src/JointFeatures.cc
@@ -472,6 +472,6 @@ Identity JointFeatures::AttachRevoluteJoint(
   return this->GenerateInvalidId();
 }
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
diff --git a/bullet/src/JointFeatures.hh b/bullet/src/JointFeatures.hh
index c11138779..2b9826e26 100644
--- a/bullet/src/JointFeatures.hh
+++ b/bullet/src/JointFeatures.hh
@@ -138,8 +138,8 @@ class JointFeatures :
       const double _value);
 };
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
 
 #endif
diff --git a/bullet/src/KinematicsFeatures.cc b/bullet/src/KinematicsFeatures.cc
index a164edf0e..370915931 100644
--- a/bullet/src/KinematicsFeatures.cc
+++ b/bullet/src/KinematicsFeatures.cc
@@ -76,6 +76,6 @@ FrameData3d KinematicsFeatures::FrameDataRelativeToWorld(
   return data;
 }
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
diff --git a/bullet/src/KinematicsFeatures.hh b/bullet/src/KinematicsFeatures.hh
index 4943e4d1c..a2e24ca48 100644
--- a/bullet/src/KinematicsFeatures.hh
+++ b/bullet/src/KinematicsFeatures.hh
@@ -38,8 +38,8 @@ class KinematicsFeatures :
   public: FrameData3d FrameDataRelativeToWorld(const FrameID &_id) const;
 };
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
 
 #endif
diff --git a/bullet/src/SDFFeatures.cc b/bullet/src/SDFFeatures.cc
index 0fafaeec7..83aa965a6 100644
--- a/bullet/src/SDFFeatures.cc
+++ b/bullet/src/SDFFeatures.cc
@@ -363,6 +363,6 @@ std::size_t SDFFeatures::FindSdfLink(
   }
 }
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
diff --git a/bullet/src/SDFFeatures.hh b/bullet/src/SDFFeatures.hh
index f8daecd67..c02cc47bf 100644
--- a/bullet/src/SDFFeatures.hh
+++ b/bullet/src/SDFFeatures.hh
@@ -71,8 +71,8 @@ class SDFFeatures :
       const std::string &_sdfLinkName);
 };
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
 
 #endif
diff --git a/bullet/src/ShapeFeatures.cc b/bullet/src/ShapeFeatures.cc
index 6c6c5695f..29e778c8a 100644
--- a/bullet/src/ShapeFeatures.cc
+++ b/bullet/src/ShapeFeatures.cc
@@ -111,6 +111,6 @@ Identity ShapeFeatures::CastToMeshShape(
   return this->GenerateInvalidId();
 }
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
diff --git a/bullet/src/ShapeFeatures.hh b/bullet/src/ShapeFeatures.hh
index 7dc9e01b5..889df0287 100644
--- a/bullet/src/ShapeFeatures.hh
+++ b/bullet/src/ShapeFeatures.hh
@@ -46,8 +46,8 @@ class ShapeFeatures :
       const Identity &_shapeID) const override;
 };
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
 
 #endif
diff --git a/bullet/src/SimulationFeatures.cc b/bullet/src/SimulationFeatures.cc
index 9e153b51a..2b3a587ef 100644
--- a/bullet/src/SimulationFeatures.cc
+++ b/bullet/src/SimulationFeatures.cc
@@ -35,6 +35,6 @@ void SimulationFeatures::WorldForwardStep(
     worldInfo->world->stepSimulation(dt.count(), 1, dt.count());
 }
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
diff --git a/bullet/src/SimulationFeatures.hh b/bullet/src/SimulationFeatures.hh
index 56d3b1026..ec3dd87e2 100644
--- a/bullet/src/SimulationFeatures.hh
+++ b/bullet/src/SimulationFeatures.hh
@@ -52,8 +52,8 @@ class SimulationFeatures :
       };
 };
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition
 
 #endif
diff --git a/bullet/src/plugin.cc b/bullet/src/plugin.cc
index c14f1a69e..6cf11d7c8 100644
--- a/bullet/src/plugin.cc
+++ b/bullet/src/plugin.cc
@@ -57,6 +57,6 @@ class Plugin :
 
 IGN_PHYSICS_ADD_PLUGIN(Plugin, FeaturePolicy3d, BulletFeatures)
 
-}
-}
-}
+}  // namespace bullet
+}  // namespace physics
+}  // namespace ignition