diff --git a/launch/include/amcl.launch b/launch/include/amcl.launch
index 3e090e3a1f27063dc010390a82ffc3f241350b48..51129439be4b0fb61ab03c59b1a59252d5996304 100644
--- a/launch/include/amcl.launch
+++ b/launch/include/amcl.launch
@@ -9,7 +9,7 @@
   <arg name="initial_x"     default="0.0"/>
   <arg name="initial_y"     default="0.0"/>
   <arg name="initial_yaw"   default="0.0"/>
-  <arg name="config"        default="$(find iri_rosnav)/params/amcl_default.yaml"/>
+  <arg name="config"        default="$(find iri_rosnav)/params/amcl.yaml"/>
   <arg name="scan_topic"    default="$(arg ns)/scan"/>
   <arg name="map_service"   default="$(arg ns/static_map"/>
   <arg name="output" default="screen" />
diff --git a/launch/include/cmd_vel_mux.launch b/launch/include/cmd_vel_mux.launch
index 4ad1580ef1079b8ef70f02e25a369ef123f8a99d..0f0de650208af6818b03df26fc0ef5a74509c206 100644
--- a/launch/include/cmd_vel_mux.launch
+++ b/launch/include/cmd_vel_mux.launch
@@ -2,11 +2,11 @@
 <!-- -->
 <launch>
 
-  <arg name="ns"                    default="robot"/>
-  <arg name="nodelet_manager_name"  default="nodelet_manager"/>
-  <arg name="config"           default="$(find iri_rosnav)/param/cmdvelmux_default.yaml"/>
-  <arg name="output"        default="log" />
-  <arg name="launch_prefix" default="" />
+  <arg name="ns"                   default="robot"/>
+  <arg name="nodelet_manager_name" default="nodelet_manager"/>
+  <arg name="config"               default="$(find iri_rosnav)/param/mux.yaml"/>
+  <arg name="output"               default="log" />
+  <arg name="launch_prefix"        default="" />
   
   <group ns="$(arg ns)">
 
diff --git a/launch/include/gmapping.launch b/launch/include/gmapping.launch
index c51bef79de79be35aac93997db737384be27310d..3588c149ef432209a605a2b47efacdf151ecddbb 100644
--- a/launch/include/gmapping.launch
+++ b/launch/include/gmapping.launch
@@ -7,7 +7,7 @@
   <arg name="map_frame_id"  default="map"/>
   <arg name="odom_frame_id" default="$(arg ns)/odom"/>
   <arg name="base_frame_id" default="$(arg ns)/base_footprint"/>
-  <arg name="config"        default="$(find iri_rosnav)/params/gmapping_default.yaml"/>
+  <arg name="config"        default="$(find iri_rosnav)/params/gmapping.yaml"/>
   <arg name="gmapping_scan_topic"    default="$(arg ns)/scan"/>
   <arg name="map_topic"     default="$(arg ns/map"/>
   <arg name="output" default="screen" />
diff --git a/package.xml b/package.xml
index d543d5a70fe18b7e073132093f0c5c619eeee5c7..e45de70774eb841e1b40baa4405174c2697cbd59 100644
--- a/package.xml
+++ b/package.xml
@@ -7,13 +7,13 @@
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
-  <maintainer email="fherrero@todo.todo">fherrero</maintainer>
+  <maintainer email="fherrero@iri.upc.edu">fherrero</maintainer>
 
 
   <!-- One license tag required, multiple allowed, one license per tag -->
   <!-- Commonly used license strings: -->
   <!--   BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
-  <license>TODO</license>
+  <license>LGPL</license>
 
 
   <!-- Url tags are optional, but multiple are allowed, one per tag -->
@@ -49,6 +49,13 @@
   <!-- Use doc_depend for packages you need only for building documentation: -->
   <!--   <doc_depend>doxygen</doc_depend> -->
   <buildtool_depend>catkin</buildtool_depend>
+  <exec_depend>amcl</exec_depend>
+  <exec_depend>yocs_cmd_vel_mux</exec_depend>
+  <exec_depend>fake_localization</exec_depend>
+  <exec_depend>gmapping</exec_depend>
+  <exec_depend>map_server</exec_depend>
+  <exec_depend>move_base</exec_depend>
+  <exec_depend>navigation</exec_depend>
 
 
   <!-- The export tag contains other, unspecified, tags -->