diff --git a/launch/talos_joint_command_rviz.launch b/launch/talos_joint_command_rviz.launch
index 489b533987ac33b86762fe63a0ec192774c625cc..7d93e0f6fff4432fa78fd7688f5caaf1926ea300 100644
--- a/launch/talos_joint_command_rviz.launch
+++ b/launch/talos_joint_command_rviz.launch
@@ -1,5 +1,5 @@
 
-roslaunch talos-data upload_legs.launch
+roslaunch talos_data upload_legs.launch
 
 rosrun joint_state_publisher joint_state_publisher _use_gui:=True
 
diff --git a/robots/talos_arm.urdf.xacro b/robots/talos_arm.urdf.xacro
index a55d2ebfb7e99f802d67756ca02b39afbd3170f6..07f5a12aa34b4bfc4eded690ae8e5f52be917adb 100644
--- a/robots/talos_arm.urdf.xacro
+++ b/robots/talos_arm.urdf.xacro
@@ -13,8 +13,8 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/arm.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/gripper/gripper.urdf.xacro" />
 
  <link name="talos_2_link">
     <inertial>
@@ -28,7 +28,7 @@
     <visual>
       <origin xyz="0 0 0" rpy="0 0 0" />
       <geometry>
-        <mesh filename="package://talos-data/meshes/talos/talos_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/talos/talos_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey" />
     </visual>
@@ -36,7 +36,7 @@
     <collision>
       <origin xyz="0 0 0" rpy="0 0 0" />
       <geometry>
-        <mesh filename="package://talos-data/meshes/talos/talos_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/talos/talos_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -48,8 +48,8 @@
   <xacro:talos_gripper name="right_gripper" parent="arm_right_7_link"/>
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_full.urdf.xacro b/robots/talos_full.urdf.xacro
index 6628166368ffc408c28f551f3033fd7685eba113..7af3453ec9159e386ad564d90db37be503e65a45 100644
--- a/robots/talos_full.urdf.xacro
+++ b/robots/talos_full.urdf.xacro
@@ -13,12 +13,12 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/torso/torso.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/head/head.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/arm.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/sensors/ftsensor.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/gripper/gripper.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/leg/leg.urdf.xacro" />
 
   <xacro:talos_torso name="torso" />
 
@@ -37,8 +37,8 @@
   <xacro:talos_leg prefix="right" reflect="-1" />
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_full_collision.urdf b/robots/talos_full_collision.urdf
index 70e52e34b0018f9505cc448d8d6ef98d7140c911..100c7a1280093b2d63e98c4575ec56d69cfa1956 100644
--- a/robots/talos_full_collision.urdf
+++ b/robots/talos_full_collision.urdf
@@ -43,14 +43,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -66,14 +66,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -101,14 +101,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -196,14 +196,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1.stl" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -238,14 +238,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2.stl" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -290,7 +290,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
 	  <geometry>
-          <mesh filename="package://talos-data/meshes/sensors/orbbec/orbbec.STL"/>
+          <mesh filename="package://talos_data/meshes/sensors/orbbec/orbbec.STL"/>
       </geometry>
       <material name="DarkGrey">
         <color rgba="0.5 0.5 0.5 1"/>
@@ -453,14 +453,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -486,14 +486,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -519,14 +519,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -555,14 +555,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -626,14 +626,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -659,14 +659,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -700,14 +700,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -837,14 +837,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -870,14 +870,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -903,14 +903,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -939,14 +939,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1010,14 +1010,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1043,14 +1043,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1084,14 +1084,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1324,14 +1324,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1352,14 +1352,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1380,14 +1380,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1408,14 +1408,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1436,14 +1436,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1464,14 +1464,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1492,14 +1492,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1520,14 +1520,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1679,14 +1679,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1707,14 +1707,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1735,14 +1735,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1763,14 +1763,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1791,14 +1791,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1819,14 +1819,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1847,14 +1847,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1875,14 +1875,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -2035,14 +2035,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2064,14 +2064,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2093,14 +2093,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2122,14 +2122,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2151,14 +2151,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2180,7 +2180,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2188,7 +2188,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
@@ -2361,14 +2361,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2390,14 +2390,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2419,14 +2419,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2448,14 +2448,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2477,14 +2477,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2506,7 +2506,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2514,7 +2514,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
diff --git a/robots/talos_full_no_grippers.urdf.xacro b/robots/talos_full_no_grippers.urdf.xacro
index 54b78bbca5cce03f4c1fdd416db6d2b380d8625b..c7c985679e8584423d25278904da9194eb1fbcfa 100644
--- a/robots/talos_full_no_grippers.urdf.xacro
+++ b/robots/talos_full_no_grippers.urdf.xacro
@@ -13,11 +13,11 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/torso/torso.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/head/head.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/arm.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/sensors/ftsensor.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/leg/leg.urdf.xacro" />
 
   <xacro:talos_torso name="torso" />
 
@@ -33,8 +33,8 @@
   <xacro:talos_leg prefix="right" reflect="-1" />
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_full_no_lower_arm.urdf.xacro b/robots/talos_full_no_lower_arm.urdf.xacro
index 43f04c4bedaa3688359fd578b7409b8697afc391..f9bd7e3d695623792aa884d17c41ec2190506a55 100644
--- a/robots/talos_full_no_lower_arm.urdf.xacro
+++ b/robots/talos_full_no_lower_arm.urdf.xacro
@@ -13,12 +13,12 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/torso/torso.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/head/head.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/arm.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/sensors/ftsensor.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/gripper/gripper.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/leg/leg.urdf.xacro" />
 
   <xacro:talos_torso name="torso" />
 
@@ -32,8 +32,8 @@
   <xacro:talos_leg prefix="right" reflect="-1" />
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_gripper.urdf.xacro b/robots/talos_gripper.urdf.xacro
index f17bdf786603e5a008d939d726887a3a1b412b7f..4245a7da434f25db30f05ed55bc1e071f38b89f9 100644
--- a/robots/talos_gripper.urdf.xacro
+++ b/robots/talos_gripper.urdf.xacro
@@ -13,17 +13,17 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/gripper/gripper.urdf.xacro" />
 
-  <xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/torso/torso.urdf.xacro" />
 
   <xacro:talos_torso name="torso" />
 
   <xacro:talos_gripper name="gripper" parent="torso_2_link"/>
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_head.urdf.xacro b/robots/talos_head.urdf.xacro
index d0cc8517ecadb41d5d5c6ae6a3dc0bc3bcc612c2..10f6e9fed8b7981ffaad1c1642114db3254800bb 100644
--- a/robots/talos_head.urdf.xacro
+++ b/robots/talos_head.urdf.xacro
@@ -13,7 +13,7 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/head/head.urdf.xacro" />
 
  <link name="talos_2_link">
     <inertial>
@@ -27,7 +27,7 @@
     <visual>
       <origin xyz="0 0 0" rpy="0 0 0" />
       <geometry>
-        <mesh filename="package://talos-data/meshes/talos/talos_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/talos/talos_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey" />
     </visual>
@@ -35,7 +35,7 @@
     <collision>
       <origin xyz="0 0 0" rpy="0 0 0" />
       <geometry>
-        <mesh filename="package://talos-data/meshes/talos/talos_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/talos/talos_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -43,8 +43,8 @@
   <xacro:talos_head name="head" parent="talos_2_link"/>
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_lower_body.urdf.xacro b/robots/talos_lower_body.urdf.xacro
index 76d345a62162d8945c5c21016dcc59eadb382493..b1495b184fa520e03c9d4259764be10f9f9b033e 100644
--- a/robots/talos_lower_body.urdf.xacro
+++ b/robots/talos_lower_body.urdf.xacro
@@ -13,7 +13,7 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/leg/leg.urdf.xacro" />
     <link name="base_link">
       <inertial>
         <origin xyz="-0.08222 0.00838 -0.07261" rpy="0.00000 0.00000 0.00000"/>
@@ -26,7 +26,7 @@
       <visual>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-          <mesh filename="package://talos-data/meshes/talos/base_link.STL" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/talos/base_link.STL" scale="1 1 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
@@ -34,7 +34,7 @@
       <collision>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-          <mesh filename="package://talos-data/meshes/talos/base_link_collision.STL" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/talos/base_link_collision.STL" scale="1 1 1"/>
         </geometry>
       </collision>  
     </link>
@@ -44,8 +44,8 @@
    <xacro:talos_leg prefix="right" reflect="-1" />
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_lower_body_with_torso.urdf.xacro b/robots/talos_lower_body_with_torso.urdf.xacro
index 40dae45587731293b3c64fa94d726ae8a846396b..1ddaa4cefba6fd7211c52ff64b892d295ee86f27 100644
--- a/robots/talos_lower_body_with_torso.urdf.xacro
+++ b/robots/talos_lower_body_with_torso.urdf.xacro
@@ -13,12 +13,12 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/torso/torso.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/head/head.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/arm.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/sensors/ftsensor.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/gripper/gripper.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/leg/leg.urdf.xacro" />
 
   <xacro:talos_torso name="torso" />
 
@@ -28,8 +28,8 @@
   <xacro:talos_leg prefix="right" reflect="-1" />
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_small.urdf.xacro b/robots/talos_small.urdf.xacro
index ff2e3605a1e553028cc561f6eef5604d8d4dc6d7..23e4345b0a2d30e2cdeb63d0fde24e7fbade5c90 100644
--- a/robots/talos_small.urdf.xacro
+++ b/robots/talos_small.urdf.xacro
@@ -13,12 +13,12 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/head/head.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/arm/arm.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/sensors/ftsensor.urdf.xacro" />
-  <!--  <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.urdf.xacro" /> -->
-  <xacro:include filename="$(find talos-data)/urdf/leg/leg.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/torso/torso.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/head/head.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/arm.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/sensors/ftsensor.urdf.xacro" />
+  <!--  <xacro:include filename="$(find talos_data)/urdf/gripper/gripper.urdf.xacro" /> -->
+  <xacro:include filename="$(find talos_data)/urdf/leg/leg.urdf.xacro" />
 
   <xacro:talos_torso name="torso" />
 
@@ -38,8 +38,8 @@
   <xacro:talos_leg prefix="right" reflect="-1" />
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/talos_torso.urdf.xacro b/robots/talos_torso.urdf.xacro
index 1b6dea493f9b59f8fe15d10217654e920a6d690c..3ba7398f1eb8dd373de09f7dfc905f6a1107382e 100644
--- a/robots/talos_torso.urdf.xacro
+++ b/robots/talos_torso.urdf.xacro
@@ -13,13 +13,13 @@
         xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller"
         xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface">
 
-  <xacro:include filename="$(find talos-data)/urdf/torso/torso.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/torso/torso.urdf.xacro" />
 
   <xacro:talos_torso name="torso" />
 
   <!-- Generic simulatalos_gazebo plugins -->
-  <xacro:include filename="$(find talos-data)/gazebo/gazebo.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/gazebo/gazebo.urdf.xacro" />
   <!-- Materials for visualization -->
-  <xacro:include filename="$(find talos-data)/urdf/materials.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/materials.urdf.xacro" />
 
 </robot>
diff --git a/robots/upload_arm.launch b/robots/upload_arm.launch
index 27a2d53f4acbeaa745ecfdbbdf552e013bb618c7..739a8e8cf3e61b27a49ff09bb33f1cb6ac8b73d1 100644
--- a/robots/upload_arm.launch
+++ b/robots/upload_arm.launch
@@ -1,6 +1,6 @@
 <launch>
 
   <!-- Robot description -->
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_arm.urdf.xacro'" />
+  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_data)/robots/talos_arm.urdf.xacro'" />
 
 </launch>
diff --git a/robots/upload_gripper.launch b/robots/upload_gripper.launch
index d959de484a1a8a53ebb3089945ac62c278034aea..9cb8705ff8192f7c7ae6ca4856d6bf38b8813f8a 100644
--- a/robots/upload_gripper.launch
+++ b/robots/upload_gripper.launch
@@ -1,6 +1,6 @@
 <launch>
 
   <!-- Robot description -->
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_gripper.urdf.xacro'" />
+  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_data)/robots/talos_gripper.urdf.xacro'" />
 
 </launch>
diff --git a/robots/upload_head.launch b/robots/upload_head.launch
index 2cb5a1eb1fc83166c248f0eba36fd134c4e0c0bd..1e6fcabab05c5c15e27f47d8fbff65d223ca5432 100644
--- a/robots/upload_head.launch
+++ b/robots/upload_head.launch
@@ -1,6 +1,6 @@
 <launch>
 
   <!-- Robot description -->
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_head.urdf.xacro'" />
+  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_data)/robots/talos_head.urdf.xacro'" />
 
 </launch>
diff --git a/robots/upload_legs.launch b/robots/upload_legs.launch
index da729c3631377f80ead3ae775042abd5377fce57..e335ea4454b3686a4f33c6ad0c519e1988780a3b 100644
--- a/robots/upload_legs.launch
+++ b/robots/upload_legs.launch
@@ -1,6 +1,6 @@
 <launch>
 
   <!-- Robot description -->
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_lower_body.urdf.xacro'" />
+  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_data)/robots/talos_lower_body.urdf.xacro'" />
 
 </launch>
diff --git a/robots/upload_talos.launch b/robots/upload_talos.launch
index 72e6ed2a8853a1c0bbd2511c6891940c3e99b991..e13341b1a889ff9a34725f4d9320004605bf885f 100644
--- a/robots/upload_talos.launch
+++ b/robots/upload_talos.launch
@@ -3,6 +3,6 @@
   <arg name="robot" default="full"/>
   
   <!-- Robot description -->
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos-data)/robots/talos_$(arg robot).urdf.xacro'" />
+  <param name="robot_description" command="$(find xacro)/xacro.py '$(find talos_data)/robots/talos_$(arg robot).urdf.xacro'" />
 
 </launch>
diff --git a/srdf/talos.srdf b/srdf/talos.srdf
index 707263cadd8d01beb0586347023bf5289b79a1b0..9f8fcbb92c07e4699cfeae3dbdffa1253f63330f 100644
--- a/srdf/talos.srdf
+++ b/srdf/talos.srdf
@@ -649,10 +649,12 @@ TALOS disabled collisions generated by Moveit! using the moveit_setup_assistant.
     <gripper name="left_gripper" clearance="0.03">
       <position> 0 0 -0.13 0.707106 0 0.707106 0</position>
       <link name="gripper_left_base_link" />
+      <joint name="gripper_left_joint" />
     </gripper>
 
     <gripper name="right_gripper" clearance="0.03">
       <position> 0 0 -0.13 0 -0.707106 0 0.707106 </position>
       <link name="gripper_right_base_link" />
+      <joint name="gripper_right_joint" />
     </gripper> 
 </robot>
diff --git a/urdf/arm/arm.urdf.xacro b/urdf/arm/arm.urdf.xacro
index af9148a7c975fb9c278092cd8f57bf733e73db33..e80b6b8da7e1123ad23e5f22c8bdc989097a94b2 100644
--- a/urdf/arm/arm.urdf.xacro
+++ b/urdf/arm/arm.urdf.xacro
@@ -11,9 +11,9 @@
 <robot xmlns:xacro="http://ros.org/wiki/xacro">
 
   <!--File includes-->
-  <xacro:include filename="$(find talos-data)/urdf/deg_to_rad.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/arm/wrist.urdf.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/arm/arm.transmission.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/deg_to_rad.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/wrist.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/arm.transmission.xacro" />
 
   <!--Constant parameters-->
   <xacro:property name="arm_friction"       value="1.0" />
@@ -48,14 +48,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_1.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_1.STL" scale="1 ${reflect} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
       <collision>
        <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 ${reflect} 1"/>
         </geometry>
       </collision>
     </link>
@@ -87,14 +87,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_2.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_2.STL" scale="1 ${reflect} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 ${reflect} 1"/>
         </geometry>
       </collision>
     </link>
@@ -127,14 +127,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_3.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_3.STL" scale="1 ${reflect} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 ${reflect} 1"/>
         </geometry>
       </collision>
     </link>
@@ -170,14 +170,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_4.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_4.STL" scale="1 ${reflect} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 ${reflect} 1"/>
         </geometry>
       </collision>
     </link>
diff --git a/urdf/arm/wrist.urdf.xacro b/urdf/arm/wrist.urdf.xacro
index 469ebe84e85e93cee2749ce7c58c249a084720be..b765ea9c642635ff051ecf86d81d8f9f95cde1e4 100644
--- a/urdf/arm/wrist.urdf.xacro
+++ b/urdf/arm/wrist.urdf.xacro
@@ -11,8 +11,8 @@
 <robot xmlns:xacro="http://ros.org/wiki/xacro">
 
   <!--File includes-->
-  <xacro:include filename="$(find talos-data)/urdf/deg_to_rad.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/arm/wrist.transmission.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/deg_to_rad.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/arm/wrist.transmission.xacro" />
 
   <!--Constant parameters-->
   <xacro:property name="wrist_friction"       value="1.0" />
@@ -44,14 +44,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_5.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_5.STL" scale="1 ${reflect} 1"/>
         </geometry>
         <material name="LightGrey" />
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 ${reflect} 1"/>
         </geometry>
       </collision>
     </link>
@@ -84,14 +84,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_6.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_6.STL" scale="1 ${reflect} 1"/>
         </geometry>
         <material name="LightGrey" />
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 ${reflect} 1"/>
         </geometry>
       </collision>
     </link>
@@ -134,7 +134,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_7.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_7.STL" scale="1 ${reflect} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
@@ -142,7 +142,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 ${reflect} 1"/>
+          <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 ${reflect} 1"/>
         </geometry>
       </collision>
     </link>
diff --git a/urdf/gripper/gripper.urdf.xacro b/urdf/gripper/gripper.urdf.xacro
index 4d535a48e9a58f2427be35214331e861291e19fa..03441306a7289c06f53d52e9bfaad24a58cea4e9 100644
--- a/urdf/gripper/gripper.urdf.xacro
+++ b/urdf/gripper/gripper.urdf.xacro
@@ -3,9 +3,9 @@
 <robot xmlns:xacro="http://ros.org/wiki/xacro">
 
   <!--File includes-->
-  <xacro:include filename="$(find talos-data)/urdf/deg_to_rad.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.transmission.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/gripper/gripper.gazebo.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/deg_to_rad.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/gripper/gripper.transmission.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/gripper/gripper.gazebo.xacro" />
 
 
   <xacro:macro name="talos_gripper" params="name parent reflect">
@@ -22,7 +22,7 @@
               <visual>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
                 </geometry>
                 <material name="DarkGrey"/>
               </visual>
@@ -30,7 +30,7 @@
               <collision>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
                 </geometry>
               </collision>
             </link>
@@ -58,7 +58,7 @@
               <visual>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
                 </geometry>
               <material name="Orange"/>
               </visual>
@@ -66,7 +66,7 @@
               <collision>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
                 </geometry>
               </collision>
             </link>
@@ -94,7 +94,7 @@
               <visual>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
                 </geometry>
               <material name="Orange"/>
               </visual>
@@ -102,7 +102,7 @@
               <collision>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
                 </geometry>
               </collision>
             </link>
@@ -132,7 +132,7 @@
               <visual>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
                 </geometry>
               <material name="DarkGrey"/>
               </visual>
@@ -140,7 +140,7 @@
               <collision>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
                 </geometry>
               </collision>
             </link>
@@ -169,7 +169,7 @@
               <visual>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
                 </geometry>
                 <material name="DarkGrey"/>
               </visual>
@@ -177,7 +177,7 @@
               <collision>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
                 </geometry>
               </collision>
             </link>
@@ -205,7 +205,7 @@
               <visual>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
                 </geometry>
               <material name="Orange"/>
               </visual>
@@ -213,7 +213,7 @@
               <collision>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
                 </geometry>
               </collision>
             </link>
@@ -242,7 +242,7 @@
               <visual>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
                 </geometry>
               <material name="Orange"/>
               </visual>
@@ -250,7 +250,7 @@
               <collision>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
                 </geometry>
               </collision>
             </link>
@@ -279,7 +279,7 @@
               <visual>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
                 </geometry>
               <material name="DarkGrey"/>
               </visual>
@@ -287,7 +287,7 @@
               <collision>
                 <origin xyz="0 0 0" rpy="0 0 0" />
                 <geometry>
-                  <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+                  <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
                 </geometry>
               </collision>
             </link>
diff --git a/urdf/head/head.urdf.xacro b/urdf/head/head.urdf.xacro
index 4597e2cece62c1dc3ca03a7cc535c722ea6c9b95..430db53787f770f307eaadef1de88487cbb80a7a 100644
--- a/urdf/head/head.urdf.xacro
+++ b/urdf/head/head.urdf.xacro
@@ -11,9 +11,9 @@
 <robot xmlns:xacro="http://ros.org/wiki/xacro">
 
   <!--File includes-->
-  <xacro:include filename="$(find talos-data)/urdf/deg_to_rad.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/head/head.transmission.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/sensors/orbbec_astra_pro.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/deg_to_rad.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/head/head.transmission.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/sensors/orbbec_astra_pro.urdf.xacro" />
 
   <!--Constant parameters-->
   <xacro:property name="head_friction" value="1.0" />
@@ -37,7 +37,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/head/head_1.stl" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/head/head_1.stl" scale="1 1 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
@@ -45,7 +45,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
         </geometry>
       </collision>
     </link>
@@ -97,7 +97,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/head/head_2.stl" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/head/head_2.stl" scale="1 1 1"/>
         </geometry>
         <material name="LightGrey" />
       </visual>
@@ -105,7 +105,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
         </geometry>
       </collision>
     </link>
diff --git a/urdf/leg/leg.urdf.xacro b/urdf/leg/leg.urdf.xacro
index 3e5fb6d887f0fc34e398ebca70d2bc04c5136ca7..9319dfb072e4f0213f93e28507201026d6dfc5b0 100644
--- a/urdf/leg/leg.urdf.xacro
+++ b/urdf/leg/leg.urdf.xacro
@@ -2,7 +2,7 @@
 
 <robot xmlns:xacro="http://ros.org/wiki/xacro" name="talos">
 
-  <xacro:include filename="$(find talos-data)/urdf/leg/leg.transmission.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/leg/leg.transmission.xacro" />
 
   <xacro:property name="deg_to_rad"       value="0.01745329251994329577" />
   <xacro:property name="eps_radians"      value="0.008" /> <!-- 0.45deg -->
@@ -27,7 +27,7 @@
       <visual>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
@@ -35,7 +35,7 @@
       <collision>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-           <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 ${reflect*1} 1"/>
+           <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision>  
     </link>
@@ -65,7 +65,7 @@
       <visual>
         <origin xyz="0 0 0.0" rpy="0  0  0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
@@ -73,7 +73,7 @@
       <collision>
       <origin xyz="0 0 0.0" rpy="0  0  0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision>
     </link>
@@ -102,7 +102,7 @@
       <visual>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
@@ -110,7 +110,7 @@
       <collision>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-           <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 ${reflect*1} 1"/>
+           <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision>  
     </link>
@@ -139,7 +139,7 @@
       <visual>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
         <material name="DarkGrey" />
       </visual>
@@ -147,7 +147,7 @@
       <collision>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-           <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 ${reflect*1} 1"/>
+           <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision>  
     </link>
@@ -177,7 +177,7 @@
       <visual>
         <origin xyz="0 0 0.0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
         <material name="Grey" />
       </visual>
@@ -185,7 +185,7 @@
       <collision>
         <origin xyz="0 0 0.0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision>  
     </link>
@@ -214,7 +214,7 @@
       <visual>
         <origin rpy="0 0 0" xyz="0 0 0"/>
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
         <material name="Grey" />
       </visual>
@@ -223,7 +223,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
diff --git a/urdf/sensors/orbbec_astra_pro.urdf.xacro b/urdf/sensors/orbbec_astra_pro.urdf.xacro
index 9beb0adb855821cfcfdf1ae21eaf620cfe9f08f4..5a685408da8b14903e15ff7e01791da03ed9f895 100644
--- a/urdf/sensors/orbbec_astra_pro.urdf.xacro
+++ b/urdf/sensors/orbbec_astra_pro.urdf.xacro
@@ -24,7 +24,7 @@
 -->
 <robot xmlns:xacro="http://ros.org/wiki/xacro">
 
-  <xacro:include filename="$(find talos-data)/urdf/sensors/xtion_pro_live.gazebo.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/sensors/xtion_pro_live.gazebo.xacro" />
 
   <!-- Macro -->
   <xacro:macro name="xtion_pro_live" params="name parent *origin *optical_origin">
@@ -50,7 +50,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0"/>
         <geometry>
-          <mesh filename="package://talos-data/meshes/sensors/orbbec/orbbec.STL" />
+          <mesh filename="package://talos_data/meshes/sensors/orbbec/orbbec.STL" />
         </geometry>
         <material name="DarkGrey">
           <color rgba="0.5 0.5 0.5 1"/>
diff --git a/urdf/talos_full.urdf b/urdf/talos_full.urdf
index 3eaa8bc8f7cb52ace03f6fc5428d41e9f0bde7e7..023d2333fbea8361fe8176dfc61a1a130548ddae 100644
--- a/urdf/talos_full.urdf
+++ b/urdf/talos_full.urdf
@@ -43,14 +43,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -66,14 +66,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -101,14 +101,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -196,14 +196,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1.stl" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -238,14 +238,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2.stl" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -289,7 +289,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/sensors/orbbec/orbbec.STL"/>
+        <mesh filename="package://talos_data/meshes/sensors/orbbec/orbbec.STL"/>
       </geometry>
       <material name="DarkGrey">
         <color rgba="0.5 0.5 0.5 1"/>
@@ -451,14 +451,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -484,14 +484,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -517,14 +517,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -553,14 +553,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -624,14 +624,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -657,14 +657,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -698,14 +698,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -835,14 +835,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -868,14 +868,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -901,14 +901,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -937,14 +937,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1008,14 +1008,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1041,14 +1041,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1082,14 +1082,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1322,14 +1322,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1350,14 +1350,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1378,14 +1378,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1406,14 +1406,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1434,14 +1434,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1462,14 +1462,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1490,14 +1490,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1518,14 +1518,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1677,14 +1677,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1705,14 +1705,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1733,14 +1733,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1761,14 +1761,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1789,14 +1789,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1817,14 +1817,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1845,14 +1845,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1873,14 +1873,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -2033,14 +2033,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2062,14 +2062,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2091,14 +2091,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2120,14 +2120,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2149,14 +2149,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2178,7 +2178,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2186,7 +2186,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
@@ -2359,14 +2359,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2388,14 +2388,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2417,14 +2417,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2446,14 +2446,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2475,14 +2475,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2504,7 +2504,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2512,7 +2512,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
diff --git a/urdf/talos_full_accurate_gripper.urdf b/urdf/talos_full_accurate_gripper.urdf
index 8c93432014ab36cc85f55a8c8fca1036ad8069af..94ba7d7a4c6273231bf3cd6001696717c72bec0c 100644
--- a/urdf/talos_full_accurate_gripper.urdf
+++ b/urdf/talos_full_accurate_gripper.urdf
@@ -43,14 +43,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -66,14 +66,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -101,14 +101,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -196,14 +196,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1.stl" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -238,14 +238,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2.stl" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -289,7 +289,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/sensors/orbbec/orbbec.STL"/>
+        <mesh filename="package://talos_data/meshes/sensors/orbbec/orbbec.STL"/>
       </geometry>
       <material name="DarkGrey">
         <color rgba="0.5 0.5 0.5 1"/>
@@ -451,14 +451,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -484,14 +484,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -517,14 +517,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -553,14 +553,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -624,14 +624,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -657,14 +657,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -698,14 +698,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -835,14 +835,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -868,14 +868,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -901,14 +901,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -937,14 +937,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1008,14 +1008,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1041,14 +1041,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1082,14 +1082,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1322,14 +1322,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1350,14 +1350,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1378,14 +1378,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1406,14 +1406,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1434,14 +1434,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1462,14 +1462,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1490,14 +1490,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1518,14 +1518,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1677,14 +1677,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1705,14 +1705,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1733,14 +1733,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1761,14 +1761,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1789,14 +1789,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1817,14 +1817,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1845,14 +1845,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1873,14 +1873,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -2033,14 +2033,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2062,14 +2062,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2091,14 +2091,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2120,14 +2120,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2149,14 +2149,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2178,7 +2178,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2186,7 +2186,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
@@ -2359,14 +2359,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2388,14 +2388,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2417,14 +2417,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2446,14 +2446,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2475,14 +2475,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2504,7 +2504,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2512,7 +2512,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
diff --git a/urdf/talos_full_collision.urdf b/urdf/talos_full_collision.urdf
index 70e52e34b0018f9505cc448d8d6ef98d7140c911..100c7a1280093b2d63e98c4575ec56d69cfa1956 100644
--- a/urdf/talos_full_collision.urdf
+++ b/urdf/talos_full_collision.urdf
@@ -43,14 +43,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -66,14 +66,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -101,14 +101,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -196,14 +196,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1.stl" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -238,14 +238,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2.stl" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -290,7 +290,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
 	  <geometry>
-          <mesh filename="package://talos-data/meshes/sensors/orbbec/orbbec.STL"/>
+          <mesh filename="package://talos_data/meshes/sensors/orbbec/orbbec.STL"/>
       </geometry>
       <material name="DarkGrey">
         <color rgba="0.5 0.5 0.5 1"/>
@@ -453,14 +453,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -486,14 +486,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -519,14 +519,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -555,14 +555,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -626,14 +626,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -659,14 +659,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -700,14 +700,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -837,14 +837,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -870,14 +870,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -903,14 +903,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -939,14 +939,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1010,14 +1010,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1043,14 +1043,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1084,14 +1084,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1324,14 +1324,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1352,14 +1352,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1380,14 +1380,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1408,14 +1408,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1436,14 +1436,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1464,14 +1464,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1492,14 +1492,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1520,14 +1520,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1679,14 +1679,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1707,14 +1707,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1735,14 +1735,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1763,14 +1763,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1791,14 +1791,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1819,14 +1819,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1847,14 +1847,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1875,14 +1875,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -2035,14 +2035,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2064,14 +2064,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2093,14 +2093,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2122,14 +2122,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2151,14 +2151,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2180,7 +2180,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2188,7 +2188,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
@@ -2361,14 +2361,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2390,14 +2390,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2419,14 +2419,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2448,14 +2448,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2477,14 +2477,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2506,7 +2506,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2514,7 +2514,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
diff --git a/urdf/talos_reduced.urdf b/urdf/talos_reduced.urdf
index bf27b317285e9598c2e8977bec913d5293249f7b..56bbdfe1b0d9ac9d7a9568b7e67925acd345918e 100644
--- a/urdf/talos_reduced.urdf
+++ b/urdf/talos_reduced.urdf
@@ -43,14 +43,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -66,14 +66,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -101,14 +101,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -196,14 +196,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1.stl" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_1_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -238,14 +238,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2.stl" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/head/head_2_collision.stl" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -290,7 +290,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
 	  <geometry>
-          <mesh filename="package://talos-data/meshes/sensors/orbbec/orbbec.STL"/>
+          <mesh filename="package://talos_data/meshes/sensors/orbbec/orbbec.STL"/>
       </geometry>
       <material name="DarkGrey">
         <color rgba="0.5 0.5 0.5 1"/>
@@ -453,14 +453,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -486,14 +486,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -519,14 +519,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -555,14 +555,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -626,14 +626,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -659,14 +659,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -700,14 +700,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -837,14 +837,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_1_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -870,14 +870,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_2_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -903,14 +903,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_3_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -939,14 +939,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_4_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1010,14 +1010,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_5_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1043,14 +1043,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="LightGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_6_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1084,14 +1084,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
+        <mesh filename="package://talos_data/meshes/arm/arm_7_collision.STL" scale="1 -1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1324,14 +1324,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1352,14 +1352,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1380,14 +1380,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1408,14 +1408,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1436,14 +1436,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1464,14 +1464,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1492,14 +1492,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1520,14 +1520,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1679,14 +1679,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/base_link_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1707,14 +1707,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1735,14 +1735,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_double_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1763,14 +1763,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1791,14 +1791,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1819,14 +1819,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/gripper_motor_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1847,14 +1847,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single.STL" scale="1 1 1"/>
       </geometry>
       <material name="Orange"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/inner_single_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -1875,14 +1875,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip.STL" scale="1 1 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
+        <mesh filename="package://talos_data/meshes/gripper/fingertip_collision.STL" scale="1 1 1"/>
       </geometry>
     </collision>
   </link>
@@ -2035,14 +2035,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2064,14 +2064,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2093,14 +2093,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2122,14 +2122,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2151,14 +2151,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2180,7 +2180,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2188,7 +2188,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
@@ -2361,14 +2361,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_z_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2390,14 +2390,14 @@
     <visual>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0  0  0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_x_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2419,14 +2419,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/hip_y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2448,14 +2448,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="DarkGrey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/knee_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2477,14 +2477,14 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
     <collision>
       <origin rpy="0 0 0" xyz="0 0 0.0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_Y_collision.stl" scale="1 -1.0 1"/>
       </geometry>
     </collision>
   </link>
@@ -2506,7 +2506,7 @@
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
-        <mesh filename="package://talos-data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
+        <mesh filename="package://talos_data/meshes/v2/ankle_X_lo_res.stl" scale="1 -1.0 1"/>
       </geometry>
       <material name="Grey"/>
     </visual>
@@ -2514,7 +2514,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
+          <mesh filename="package://talos_data/meshes/v2/ankle_X_collision.stl" scale="1 ${reflect*1} 1"/>
         </geometry>
       </collision> 
       
diff --git a/urdf/torso/torso.urdf.xacro b/urdf/torso/torso.urdf.xacro
index e188912ad51f08ba619de54f2e292ede5ba329aa..f20cb81ebd92651f8ea8fb98f8bb7fe36e4d0b84 100644
--- a/urdf/torso/torso.urdf.xacro
+++ b/urdf/torso/torso.urdf.xacro
@@ -11,9 +11,9 @@
 <robot xmlns:xacro="http://ros.org/wiki/xacro">
 
   <!--File includes-->
-  <xacro:include filename="$(find talos-data)/urdf/deg_to_rad.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/torso/torso.transmission.xacro" />
-  <xacro:include filename="$(find talos-data)/urdf/sensors/imu.urdf.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/deg_to_rad.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/torso/torso.transmission.xacro" />
+  <xacro:include filename="$(find talos_data)/urdf/sensors/imu.urdf.xacro" />
 
  <!--Constant parameters-->
   <xacro:property name="torso_max_vel"  value="5.4" />
@@ -36,7 +36,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/torso/torso_2.STL" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/torso/torso_2.STL" scale="1 1 1"/>
         </geometry>
         <material name="LightGrey" />
       </visual>
@@ -44,7 +44,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/torso/torso_2_collision.STL" scale="1 1 1"/>
         </geometry>
       </collision>
     </link>
@@ -64,14 +64,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
         </geometry>
         <material name="LightGrey" />
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/torso/torso_1.STL" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/torso/torso_1.STL" scale="1 1 1"/>
         </geometry>
       </collision>
     </link>
@@ -107,7 +107,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/torso/base_link.STL" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/torso/base_link.STL" scale="1 1 1"/>
         </geometry>
         <material name="LightGrey" />
       </visual>
@@ -115,7 +115,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://talos-data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
+          <mesh filename="package://talos_data/meshes/torso/base_link_collision.STL" scale="1 1 1"/>
         </geometry>
       </collision>
     </link>