diff --git a/launch_remote_ssh/launch_remote_ssh/execute_process_remote_ssh.py b/launch_remote_ssh/launch_remote_ssh/execute_process_remote_ssh.py
index 2c98746..0a7a1d1 100644
--- a/launch_remote_ssh/launch_remote_ssh/execute_process_remote_ssh.py
+++ b/launch_remote_ssh/launch_remote_ssh/execute_process_remote_ssh.py
@@ -149,7 +149,7 @@ def __init__(
                     package='launch_remote_ssh',
                     executable='remote_process_handler',
                     name='remote_process_handler_' + self.uuid_short,
-                    namespace=ReplaceTextSubstitution(self.__machine, '.', '_'),
+                    namespace=['machine_',ReplaceTextSubstitution(ReplaceTextSubstitution(self.__machine, '.', '_'),'-','_')],
                     output='screen',
                     parameters=[{'screen_process_name': process_name_list}],
                     condition=self.__condition,