diff --git a/CMakeLists.txt b/CMakeLists.txt
index fde2ae8103177d629dee3095d7e433b612b99224..6e6ea89902bb0aaedff848c641693837bbf881a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,9 +103,12 @@ generate_dynamic_reconfigure_options(
 ## LIBRARIES: libraries you create in this project that dependent projects also need
 ## CATKIN_DEPENDS: catkin_packages dependent projects also need
 ## DEPENDS: system dependencies of this project that dependent projects also need
+set(module_name tiago_nav_module)
+set(module_bt_name tiago_nav_module_bt)
+
 catkin_package(
  INCLUDE_DIRS include
- LIBRARIES tiago_nav_module 
+ LIBRARIES ${module_name} ${module_bt_name}
  CATKIN_DEPENDS roscpp dynamic_reconfigure iri_ros_tools actionlib std_srvs move_base_msgs tf nav_msgs pal_navigation_msgs pal_waypoint_msgs iri_base_algorithm iri_behaviortree
 #  DEPENDS system_lib
 )
@@ -121,7 +124,7 @@ include_directories(${catkin_INCLUDE_DIRS})
 include_directories(${iriutils_INCLUDE_DIR})
 
 ## Declare a C++ libraryi
-set(module_name tiago_nav_module)
+# Module
 add_library(${module_name}
   src/tiago_nav_module.cpp
 )
@@ -137,6 +140,7 @@ target_link_libraries(${module_name} ${iriutils_LIBRARY})
 add_dependencies(${module_name} ${${PROJECT_NAME}_EXPORTED_TARGETS})
 
 ## Declare a C++ executable
+#Module_client
 set(client_name tiago_nav_client)
 add_executable(${client_name} src/tiago_nav_client_alg.cpp src/tiago_nav_client_alg_node.cpp)
 
@@ -147,7 +151,7 @@ target_link_libraries(${client_name} ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_
 add_dependencies(${client_name} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${module_name})
 add_dependencies(${client_name} ${tiago_nav_client_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
 
-set(module_bt_name tiago_nav_module_bt)
+#BT_module
 add_library(${module_bt_name} src/tiago_nav_bt_module.cpp)
 target_link_libraries(${module_bt_name} ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_DESTINATION}/lib${module_name}.so)
 target_link_libraries(${module_bt_name} ${catkin_LIBRARIES})