diff --git a/stretch_demos/launch/autodocking.launch b/stretch_demos/launch/autodocking.launch
index e8db353..97e077d 100644
--- a/stretch_demos/launch/autodocking.launch
+++ b/stretch_demos/launch/autodocking.launch
@@ -52,12 +52,12 @@
     <node name="rviz" pkg="rviz" type="rviz" output="log" args="-d $(find stretch_navigation)/rviz/navigation.rviz" if="$(arg rviz)" />
     
     <!-- ARUCO ACTION SERVER -->
-    <node name="aruco_head_scan" pkg="autodocking" type="aruco_head_scan_action.py" output="screen" />
+    <node name="aruco_head_scan" pkg="stretch_demos" type="aruco_head_scan_action.py" output="screen" />
 
     <!-- VISUAL SERVOING ACTION SERVER -->
-    <node name="visual_servoing" pkg="autodocking" type="visual_servoing_action.py" output="screen" />
+    <node name="visual_servoing" pkg="stretch_demos" type="visual_servoing_action.py" output="screen" />
 
     <!-- AUTODOCKING -->
-    <node name="autodocking" pkg="autodocking" type="autodocking_bt.py" output="screen" />
+    <node name="autodocking" pkg="stretch_demos" type="autodocking_bt.py" output="screen" />
 
 </launch>
\ No newline at end of file
diff --git a/stretch_demos/nodes/aruco_head_scan_action.py b/stretch_demos/nodes/aruco_head_scan_action.py
old mode 100644
new mode 100755
index f974c61..f982311
--- a/stretch_demos/nodes/aruco_head_scan_action.py
+++ b/stretch_demos/nodes/aruco_head_scan_action.py
@@ -9,7 +9,7 @@ import tf2_ros
 import time
 
 import actionlib
-from stretch_core.msg import ArucoHeadScanAction, ArucoHeadScanGoal, ArucoHeadScanFeedback, ArucoHeadScanResult
+from stretch_demos.msg import ArucoHeadScanAction, ArucoHeadScanGoal, ArucoHeadScanFeedback, ArucoHeadScanResult
 from trajectory_msgs.msg import JointTrajectoryPoint
 from control_msgs.msg import FollowJointTrajectoryGoal
 from tf.transformations import euler_from_quaternion, quaternion_from_euler
diff --git a/stretch_demos/nodes/autodocking_bt.py b/stretch_demos/nodes/autodocking_bt.py
old mode 100644
new mode 100755
index 360c49f..72c7890
--- a/stretch_demos/nodes/autodocking_bt.py
+++ b/stretch_demos/nodes/autodocking_bt.py
@@ -6,10 +6,10 @@ import py_trees.console as console
 import rospy
 import sys
 import functools
-from autodocking.autodocking_behaviours import MoveBaseActionClient
-from autodocking.autodocking_behaviours import CheckTF
-from autodocking.autodocking_behaviours import VisualServoing
-from stretch_core.msg import ArucoHeadScanAction, ArucoHeadScanGoal
+from stretch_demos.autodocking_behaviours import MoveBaseActionClient
+from stretch_demos.autodocking_behaviours import CheckTF
+from stretch_demos.autodocking_behaviours import VisualServoing
+from stretch_demos.msg import ArucoHeadScanAction, ArucoHeadScanGoal
 from geometry_msgs.msg import Pose
 from sensor_msgs.msg import BatteryState
 import hello_helpers.hello_misc as hm
diff --git a/stretch_demos/nodes/visual_servoing_action.py b/stretch_demos/nodes/visual_servoing_action.py
old mode 100644
new mode 100755
index f7a85d5..40c0357
--- a/stretch_demos/nodes/visual_servoing_action.py
+++ b/stretch_demos/nodes/visual_servoing_action.py
@@ -13,7 +13,7 @@ from geometry_msgs.msg import Twist
 from trajectory_msgs.msg import JointTrajectoryPoint
 from control_msgs.msg import FollowJointTrajectoryGoal
 from tf.transformations import euler_from_quaternion, quaternion_from_euler
-from autodocking.msg import VisualServoAction, VisualServoGoal, VisualServoResult, VisualServoFeedback
+from stretch_demos.msg import VisualServoAction, VisualServoGoal, VisualServoResult, VisualServoFeedback
 
 from sensor_msgs.msg import JointState
 from sensor_msgs.msg import PointCloud2
diff --git a/stretch_demos/src/stretch_demos/autodocking_behaviours.py b/stretch_demos/src/stretch_demos/autodocking_behaviours.py
index 7e93fc1..dea53a8 100644
--- a/stretch_demos/src/stretch_demos/autodocking_behaviours.py
+++ b/stretch_demos/src/stretch_demos/autodocking_behaviours.py
@@ -7,7 +7,7 @@ from actionlib_msgs.msg import GoalStatus
 from math import sqrt, pow
 from geometry_msgs.msg import Pose, TransformStamped
 from move_base_msgs.msg import MoveBaseAction, MoveBaseGoal
-from autodocking.msg import VisualServoAction, VisualServoGoal, VisualServoResult, VisualServoFeedback
+from stretch_demos.msg import VisualServoAction, VisualServoGoal, VisualServoResult, VisualServoFeedback
 import tf2_ros
 
 class MoveBaseActionClient(py_trees.behaviour.Behaviour):