diff --git a/safety_master_plugin/launch/master_plugin.launch b/safety_master_plugin/launch/master_plugin.launch
index 2f98cd1..eac49d8 100644
--- a/safety_master_plugin/launch/master_plugin.launch
+++ b/safety_master_plugin/launch/master_plugin.launch
@@ -1,7 +1,7 @@
 <launch>
   <node pkg="rqt_gui"
         type="rqt_gui"
-        name="master_rqt_gui"
+        name="$(anon master_plugin)"
         args="--standalone safety_master_plugin"
   />
 </launch>
\ No newline at end of file
diff --git a/safety_master_plugin/scripts/master_plugin.py b/safety_master_plugin/scripts/master_plugin.py
index 4b8a28b..92f9160 100755
--- a/safety_master_plugin/scripts/master_plugin.py
+++ b/safety_master_plugin/scripts/master_plugin.py
@@ -1,6 +1,6 @@
 from ros_master_wrapper import ROSWrapper
 from qt_master_wrapper import QtWrapper
-from restrictions import Restrictions
+from master_restrictions import Restrictions
 
 from master_info import MasterInfo
 from master_widget import MasterWidget
diff --git a/safety_master_plugin/scripts/ros_master_wrapper.py b/safety_master_plugin/scripts/ros_master_wrapper.py
index 3c9a7ab..5237364 100644
--- a/safety_master_plugin/scripts/ros_master_wrapper.py
+++ b/safety_master_plugin/scripts/ros_master_wrapper.py
@@ -7,7 +7,7 @@ from safety_user_plugin.msg import RobotInfoMsg
 from safety_user_plugin.msg import RestrictionsMsg
 
 from robot_info import RobotInfo
-from restrictions import Restrictions
+from master_restrictions import Restrictions
 
 from enums.stop_state import StopState as SS
 
diff --git a/safety_user_plugin/launch/user_plugin.launch b/safety_user_plugin/launch/user_plugin.launch
index 26fc0cb..c22fd76 100644
--- a/safety_user_plugin/launch/user_plugin.launch
+++ b/safety_user_plugin/launch/user_plugin.launch
@@ -1,7 +1,7 @@
 <launch>
   <node pkg="rqt_gui"
         type="rqt_gui"
-        name="rqt_gui"
+        name="$(anon user_plugin)"
         args="--standalone safety_user_plugin"
   />
 </launch>
\ No newline at end of file