diff --git a/safety_master_plugin/package.xml b/safety_master_plugin/package.xml
index 64b732e..a4f058c 100644
--- a/safety_master_plugin/package.xml
+++ b/safety_master_plugin/package.xml
@@ -14,20 +14,20 @@
   <build_depend>rqt_gui</build_depend>
   <build_depend>rqt_gui_py</build_depend>
   <build_depend>std_msgs</build_depend>
-  <build_depend>safety_user_plugin</build_depend>
+  <build_depend>rosaria_msgs</build_depend>
 
   <build_export_depend>rospy</build_export_depend>
   <build_export_depend>rqt_gui</build_export_depend>
   <build_export_depend>rqt_gui_py</build_export_depend>
   <build_export_depend>std_msgs</build_export_depend>
-  <build_export_depend>safety_user_plugin</build_export_depend>
+  <build_export_depend>rosaria_msgs</build_export_depend>
 
   <exec_depend>rospy</exec_depend>
   <exec_depend>rqt_gui</exec_depend>
   <exec_depend>rqt_gui_py</exec_depend>
   <exec_depend>std_msgs</exec_depend>
   <exec_depend>message_runtime</exec_depend>
-  <exec_depend>safety_user_plugin</exec_depend>
+  <exec_depend>rosaria_msgs</exec_depend>
 
   <export>
     <rqt_gui plugin="${prefix}/plugin.xml"/>
diff --git a/safety_master_plugin/scripts/ros_master_wrapper.py b/safety_master_plugin/scripts/ros_master_wrapper.py
index 5237364..9fa80be 100644
--- a/safety_master_plugin/scripts/ros_master_wrapper.py
+++ b/safety_master_plugin/scripts/ros_master_wrapper.py
@@ -3,8 +3,8 @@ import rospy
 import rospkg
 
 from std_msgs.msg import Bool
-from safety_user_plugin.msg import RobotInfoMsg
-from safety_user_plugin.msg import RestrictionsMsg
+from rosaria_msgs.msg import RobotInfoMsg
+from rosaria_msgs.msg import RestrictionsMsg
 
 from robot_info import RobotInfo
 from master_restrictions import Restrictions
diff --git a/safety_user_plugin/package.xml b/safety_user_plugin/package.xml
index d4203e5..ed32ff3 100644
--- a/safety_user_plugin/package.xml
+++ b/safety_user_plugin/package.xml
@@ -15,18 +15,21 @@
   <build_depend>rqt_gui_py</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>message_generation</build_depend>
+  <build_depend>rosaria_msgs</build_depend>
   
   <build_export_depend>rospy</build_export_depend>
   <build_export_depend>rqt_gui</build_export_depend>
   <build_export_depend>rqt_gui_py</build_export_depend>
   <build_export_depend>std_msgs</build_export_depend>
   <build_export_depend>message_generation</build_export_depend>
+  <build_export_depend>rosaria_msgs</build_export_depend>
 
   <exec_depend>rospy</exec_depend>
   <exec_depend>rqt_gui</exec_depend>
   <exec_depend>rqt_gui_py</exec_depend>
   <exec_depend>std_msgs</exec_depend>
   <exec_depend>message_runtime</exec_depend>
+  <exec_depend>rosaria_msgs</exec_depend>
 
   <export>
     <rqt_gui plugin="${prefix}/plugin.xml"/>
diff --git a/safety_user_plugin/scripts/ros_wrapper.py b/safety_user_plugin/scripts/ros_wrapper.py
index 68f32ff..8e08f33 100644
--- a/safety_user_plugin/scripts/ros_wrapper.py
+++ b/safety_user_plugin/scripts/ros_wrapper.py
@@ -3,8 +3,8 @@ import rospy
 import rospkg
 
 from std_msgs.msg import Bool
-from safety_user_plugin.msg import RobotInfoMsg
-from safety_user_plugin.msg import RestrictionsMsg
+from rosaria_msgs.msg import RobotInfoMsg
+from rosaria_msgs.msg import RestrictionsMsg
 
 from robot_info import RobotInfo
 from restrictions import Restrictions