diff --git a/include/coal/fwd.hh b/include/coal/fwd.hh
index 71ffb5124a03cc48263629ce07a9176b273ffa09..c2408880a9b11f8271a6b1444395792ec6b1d417 100644
--- a/include/coal/fwd.hh
+++ b/include/coal/fwd.hh
@@ -99,22 +99,22 @@
 // GCC version 4.6 and higher supports -Wmaybe-uninitialized
 #if (defined(__GNUC__) && \
      ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
-#define HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED \
+#define COAL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED \
   _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
 // Use __has_warning with clang. Clang introduced it in 2024 (3.5+)
 #elif (defined(__clang__) && defined(__has_warning) && \
        __has_warning("-Wmaybe-uninitialized"))
-#define HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED \
+#define COAL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED \
   _Pragma("clang diagnostic ignored \"-Wmaybe-uninitialized\"")
 #else
-#define HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED
+#define COAL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED
 #endif
 #elif defined(WIN32)
 #define COAL_COMPILER_DIAGNOSTIC_PUSH _Pragma("warning(push)")
 #define COAL_COMPILER_DIAGNOSTIC_POP _Pragma("warning(pop)")
 #define COAL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS \
   _Pragma("warning(disable : 4996)")
-#define HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED \
+#define COAL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED \
   _Pragma("warning(disable : 4700)")
 #else
 #define COAL_COMPILER_DIAGNOSTIC_PUSH
diff --git a/include/coal/internal/traversal_node_setup.h b/include/coal/internal/traversal_node_setup.h
index 4f892a02ab5b7ccd1808cd25b4ec646c1462fc0e..120633edc049c8f3a53069a1bdf6b078fc95ddc0 100644
--- a/include/coal/internal/traversal_node_setup.h
+++ b/include/coal/internal/traversal_node_setup.h
@@ -681,13 +681,13 @@ bool initialize(MeshDistanceTraversalNode<BV, 0>& node,
   node.tri_indices2 =
       model2.tri_indices.get() ? model2.tri_indices->data() : NULL;
 
-  HPP_FCL_COMPILER_DIAGNOSTIC_PUSH
-  HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED
+  COAL_COMPILER_DIAGNOSTIC_PUSH
+  COAL_COMPILER_DIAGNOSTIC_IGNORED_MAYBE_UNINITIALIZED
 
   relativeTransform(tf1.getRotation(), tf1.getTranslation(), tf2.getRotation(),
                     tf2.getTranslation(), node.RT.R, node.RT.T);
 
-  HPP_FCL_COMPILER_DIAGNOSTIC_POP
+  COAL_COMPILER_DIAGNOSTIC_POP
 
   return true;
 }
diff --git a/include/coal/serialization/fwd.h b/include/coal/serialization/fwd.h
index e56e661b32d1907332980e445148761be87632b6..3ed363acd6ec0f1acd8d94d5d6f29c9fd50f3681 100644
--- a/include/coal/serialization/fwd.h
+++ b/include/coal/serialization/fwd.h
@@ -74,10 +74,10 @@ struct cast_register_initializer {
   void init(std::false_type) const {}
 
   cast_register_initializer const& init() const {
-    HPP_FCL_COMPILER_DIAGNOSTIC_PUSH
+    COAL_COMPILER_DIAGNOSTIC_PUSH
     _Pragma("GCC diagnostic ignored \"-Wconversion\"")
         BOOST_STATIC_WARNING((std::is_base_of<Base, Derived>::value));
-    HPP_FCL_COMPILER_DIAGNOSTIC_POP
+    COAL_COMPILER_DIAGNOSTIC_POP
     init(std::is_base_of<Base, Derived>());
     return *this;
   }
diff --git a/python/collision.cc b/python/collision.cc
index 2c92ad083ef05d6c51e331fa3ee650a761454a09..b50a8819001aa5758118590d0198cb8b0f390a38 100644
--- a/python/collision.cc
+++ b/python/collision.cc
@@ -94,8 +94,8 @@ void exposeCollisionAPI() {
         .def("clear", &CPUTimes::clear, arg("self"), "Reset the time values.");
   }
 
-  HPP_FCL_COMPILER_DIAGNOSTIC_PUSH
-  HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
+  COAL_COMPILER_DIAGNOSTIC_PUSH
+  COAL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
   if (!eigenpy::register_symbolic_link_to_registered_type<QueryRequest>()) {
     class_<QueryRequest>("QueryRequest", doxygen::class_doc<QueryRequest>(),
                          no_init)
@@ -132,10 +132,10 @@ void exposeCollisionAPI() {
         .DEF_RW_CLASS_ATTRIB(QueryRequest, enable_timings)
         .DEF_CLASS_FUNC(QueryRequest, updateGuess);
   }
-  HPP_FCL_COMPILER_DIAGNOSTIC_POP
+  COAL_COMPILER_DIAGNOSTIC_POP
 
-  HPP_FCL_COMPILER_DIAGNOSTIC_PUSH
-  HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
+  COAL_COMPILER_DIAGNOSTIC_PUSH
+  COAL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
   if (!eigenpy::register_symbolic_link_to_registered_type<CollisionRequest>()) {
     class_<CollisionRequest, bases<QueryRequest> >(
         "CollisionRequest", doxygen::class_doc<CollisionRequest>(), no_init)
@@ -174,7 +174,7 @@ void exposeCollisionAPI() {
     class_<std::vector<CollisionRequest> >("StdVec_CollisionRequest")
         .def(vector_indexing_suite<std::vector<CollisionRequest> >());
   }
-  HPP_FCL_COMPILER_DIAGNOSTIC_POP
+  COAL_COMPILER_DIAGNOSTIC_POP
 
   if (!eigenpy::register_symbolic_link_to_registered_type<Contact>()) {
     class_<Contact>("Contact", doxygen::class_doc<Contact>(),
diff --git a/python/distance.cc b/python/distance.cc
index 1251428bb753258864180d64fda6f94737dd8540..f4c1a26a615bb31c3e11d1c6e588ac770fa2c6ef 100644
--- a/python/distance.cc
+++ b/python/distance.cc
@@ -68,8 +68,8 @@ struct DistanceResultWrapper {
 };
 
 void exposeDistanceAPI() {
-  HPP_FCL_COMPILER_DIAGNOSTIC_PUSH
-  HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
+  COAL_COMPILER_DIAGNOSTIC_PUSH
+  COAL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
   if (!eigenpy::register_symbolic_link_to_registered_type<DistanceRequest>()) {
     class_<DistanceRequest, bases<QueryRequest> >(
         "DistanceRequest", doxygen::class_doc<DistanceRequest>(),
@@ -111,7 +111,7 @@ void exposeDistanceAPI() {
         .DEF_RW_CLASS_ATTRIB(DistanceRequest, abs_err)
         .def(SerializableVisitor<DistanceRequest>());
   }
-  HPP_FCL_COMPILER_DIAGNOSTIC_POP
+  COAL_COMPILER_DIAGNOSTIC_POP
 
   if (!eigenpy::register_symbolic_link_to_registered_type<
           std::vector<DistanceRequest> >()) {
diff --git a/test/collision.cpp b/test/collision.cpp
index 04bddb945b219ca3d79c779479f68c7db8f62498..70c8d2810fcbad5e6e7c2131433b980eb727cbca 100644
--- a/test/collision.cpp
+++ b/test/collision.cpp
@@ -308,8 +308,8 @@ struct traits<KDOP<N>, Oriented, recursive> : base_traits {
   enum { IS_IMPLEMENTED = false };
 };
 
-HPP_FCL_COMPILER_DIAGNOSTIC_PUSH
-HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
+COAL_COMPILER_DIAGNOSTIC_PUSH
+COAL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
 
 struct mesh_mesh_run_test {
   mesh_mesh_run_test(const std::vector<Transform3s>& _transforms,
@@ -330,7 +330,7 @@ struct mesh_mesh_run_test {
 
   int indent;
 
-  HPP_FCL_COMPILER_DIAGNOSTIC_POP
+  COAL_COMPILER_DIAGNOSTIC_POP
 
   const char* getindent() {
     assert(indent < 9);
@@ -641,8 +641,8 @@ BOOST_AUTO_TEST_CASE(mesh_mesh) {
             << transforms[i].getQuatRotation().coeffs().format(f));
   }
 
-  HPP_FCL_COMPILER_DIAGNOSTIC_PUSH
-  HPP_FCL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
+  COAL_COMPILER_DIAGNOSTIC_PUSH
+  COAL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
 
   // Request all contacts and check that all methods give the same result.
   mesh_mesh_run_test runner(
@@ -650,7 +650,7 @@ BOOST_AUTO_TEST_CASE(mesh_mesh) {
   runner.enable_statistics = true;
   boost::mpl::for_each<BVs_t, wrap<boost::mpl::placeholders::_1> >(runner);
 
-  HPP_FCL_COMPILER_DIAGNOSTIC_POP
+  COAL_COMPILER_DIAGNOSTIC_POP
 }
 
 BOOST_AUTO_TEST_CASE(mesh_mesh_benchmark) {