diff --git a/python/broadphase/broadphase.cc b/python/broadphase/broadphase.cc
index 57da9076138a5407a6c9ab10f2df9977b30102a1..788fb73ed56bed4ae0442ab40e6a582f12467a89 100644
--- a/python/broadphase/broadphase.cc
+++ b/python/broadphase/broadphase.cc
@@ -49,15 +49,15 @@ COAL_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 #include "doxygen_autodoc/functions.h"
 COAL_COMPILER_DIAGNOSTIC_POP
-#include "doxygen_autodoc/hpp/fcl/broadphase/default_broadphase_callbacks.h"
-// #include "doxygen_autodoc/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h"
+#include "doxygen_autodoc/coal/broadphase/default_broadphase_callbacks.h"
+// #include "doxygen_autodoc/coal/broadphase/broadphase_dynamic_AABB_tree.h"
 // #include
-//"doxygen_autodoc/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h"
-// #include "doxygen_autodoc/hpp/fcl/broadphase/broadphase_bruteforce.h"
-// #include "doxygen_autodoc/hpp/fcl/broadphase/broadphase_SaP.h"
-// #include "doxygen_autodoc/hpp/fcl/broadphase/broadphase_SSaP.h"
-// #include "doxygen_autodoc/hpp/fcl/broadphase/broadphase_interval_tree.h"
-// #include "doxygen_autodoc/hpp/fcl/broadphase/broadphase_spatialhash.h"
+//"doxygen_autodoc/coal/broadphase/broadphase_dynamic_AABB_tree_array.h"
+// #include "doxygen_autodoc/coal/broadphase/broadphase_bruteforce.h"
+// #include "doxygen_autodoc/coal/broadphase/broadphase_SaP.h"
+// #include "doxygen_autodoc/coal/broadphase/broadphase_SSaP.h"
+// #include "doxygen_autodoc/coal/broadphase/broadphase_interval_tree.h"
+// #include "doxygen_autodoc/coal/broadphase/broadphase_spatialhash.h"
 #endif
 
 #include "broadphase_callbacks.hh"
diff --git a/python/broadphase/broadphase_callbacks.hh b/python/broadphase/broadphase_callbacks.hh
index f591fee9f4369653fab681fbcd2a4a947919231e..03790438f861b3a5d9340355ec3ee1837e2e6a60 100644
--- a/python/broadphase/broadphase_callbacks.hh
+++ b/python/broadphase/broadphase_callbacks.hh
@@ -44,7 +44,7 @@
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 #include "doxygen_autodoc/functions.h"
-#include "doxygen_autodoc/hpp/fcl/broadphase/broadphase_callbacks.h"
+#include "doxygen_autodoc/coal/broadphase/broadphase_callbacks.h"
 #endif
 
 namespace coal {
diff --git a/python/broadphase/broadphase_collision_manager.hh b/python/broadphase/broadphase_collision_manager.hh
index 3dbcb5c1b4f6b8bec9d7a4c92b31e9155c095bbd..2624c0dcb681ef04d434259f976836ebd15809e6 100644
--- a/python/broadphase/broadphase_collision_manager.hh
+++ b/python/broadphase/broadphase_collision_manager.hh
@@ -45,7 +45,7 @@
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 #include "doxygen_autodoc/functions.h"
-#include "doxygen_autodoc/hpp/fcl/broadphase/broadphase_collision_manager.h"
+#include "doxygen_autodoc/coal/broadphase/broadphase_collision_manager.h"
 #endif
 
 #include <boost/algorithm/string/replace.hpp>
diff --git a/python/coal.cc b/python/coal.cc
index b792f0c704b99e045d37f46c0b5a8e0fa14d2fed..dee8825d1bf5bb8cb820e412dd3f3e7fc570c260 100644
--- a/python/coal.cc
+++ b/python/coal.cc
@@ -45,7 +45,7 @@
 #include "coal/collision.h"
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
-#include "doxygen_autodoc/hpp/fcl/mesh_loader/loader.h"
+#include "doxygen_autodoc/coal/mesh_loader/loader.h"
 #endif
 
 #include "../doc/python/doxygen.hh"
diff --git a/python/collision-geometries.cc b/python/collision-geometries.cc
index b44c7213c2784e404a6b5308bde5a4a2aee7bea8..32aa74d51b17c5ba78992be1ed19d42c10eec29b 100644
--- a/python/collision-geometries.cc
+++ b/python/collision-geometries.cc
@@ -56,14 +56,14 @@
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 // FIXME for a reason I do not understand, doxygen fails to understand that
-// BV_splitter is not defined in hpp/fcl/BVH/BVH_model.h
+// BV_splitter is not defined in coal/BVH/BVH_model.h
 #include "coal/internal/BV_splitter.h"
 #include "coal/broadphase/detail/hierarchy_tree.h"
 
-#include "doxygen_autodoc/hpp/fcl/BVH/BVH_model.h"
-#include "doxygen_autodoc/hpp/fcl/BV/AABB.h"
-#include "doxygen_autodoc/hpp/fcl/hfield.h"
-#include "doxygen_autodoc/hpp/fcl/shape/geometric_shapes.h"
+#include "doxygen_autodoc/coal/BVH/BVH_model.h"
+#include "doxygen_autodoc/coal/BV/AABB.h"
+#include "doxygen_autodoc/coal/hfield.h"
+#include "doxygen_autodoc/coal/shape/geometric_shapes.h"
 #include "doxygen_autodoc/functions.h"
 #endif
 
diff --git a/python/collision.cc b/python/collision.cc
index 88eb4d0b4f53383e1e31f8c2170da3f81a8127b7..71b2926891f2755e6a8fa2bfc24150f476767798 100644
--- a/python/collision.cc
+++ b/python/collision.cc
@@ -47,7 +47,7 @@ COAL_COMPILER_DIAGNOSTIC_POP
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 #include "doxygen_autodoc/functions.h"
-#include "doxygen_autodoc/hpp/fcl/collision_data.h"
+#include "doxygen_autodoc/coal/collision_data.h"
 #endif
 
 #include "../doc/python/doxygen.hh"
diff --git a/python/contact_patch.cc b/python/contact_patch.cc
index 8ac35cbdf896c1347b8976dcb47f94aa51e3695b..e79721125d3965ef2cea2cb8aa7a6f3658070775 100644
--- a/python/contact_patch.cc
+++ b/python/contact_patch.cc
@@ -44,7 +44,7 @@
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 #include "doxygen_autodoc/functions.h"
-#include "doxygen_autodoc/hpp/fcl/collision_data.h"
+#include "doxygen_autodoc/coal/collision_data.h"
 #endif
 
 #include "../doc/python/doxygen.hh"
diff --git a/python/distance.cc b/python/distance.cc
index 4f229ff6a2fbcf1c16a3bcbb0072a9ecdce89bd6..e6080a8b7fe0634c0b1bb16f6356e30e186e8e0c 100644
--- a/python/distance.cc
+++ b/python/distance.cc
@@ -49,7 +49,7 @@ COAL_COMPILER_DIAGNOSTIC_POP
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 #include "doxygen_autodoc/functions.h"
-#include "doxygen_autodoc/hpp/fcl/collision_data.h"
+#include "doxygen_autodoc/coal/collision_data.h"
 #endif
 
 using namespace boost::python;
diff --git a/python/gjk.cc b/python/gjk.cc
index 256b32eec3cc6152e6ed25969faff550b7021cf5..c5dbb0d10a52a9627f55d0a4a9149753f5d61228 100644
--- a/python/gjk.cc
+++ b/python/gjk.cc
@@ -41,7 +41,7 @@
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 #include "doxygen_autodoc/functions.h"
-#include "doxygen_autodoc/hpp/fcl/narrowphase/gjk.h"
+#include "doxygen_autodoc/coal/narrowphase/gjk.h"
 #endif
 
 using namespace boost::python;
diff --git a/python/math.cc b/python/math.cc
index b8ef731ffc5ec7383d1bf23f3d671e2ee31aedbf..1622eb3402935b0abcad63dfe95a4c548a766935 100644
--- a/python/math.cc
+++ b/python/math.cc
@@ -44,7 +44,7 @@
 #include "serializable.hh"
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
-#include "doxygen_autodoc/hpp/fcl/math/transform.h"
+#include "doxygen_autodoc/coal/math/transform.h"
 #endif
 
 using namespace boost::python;
diff --git a/python/octree.cc b/python/octree.cc
index 73781f458cde8705ca8635d0cc340af740482815..c18c7d64b7d5f96a1ddbde55be7accd2ec559fc6 100644
--- a/python/octree.cc
+++ b/python/octree.cc
@@ -8,7 +8,7 @@
 
 #ifdef COAL_HAS_DOXYGEN_AUTODOC
 #include "doxygen_autodoc/functions.h"
-#include "doxygen_autodoc/hpp/fcl/octree.h"
+#include "doxygen_autodoc/coal/octree.h"
 #endif
 
 bp::object toPyBytes(std::vector<uint8_t>& bytes) {