diff --git a/salt/daemons/flo/core.py b/salt/daemons/flo/core.py
index bbfd67abe6..ad10800bb6 100644
--- a/salt/daemons/flo/core.py
+++ b/salt/daemons/flo/core.py
@@ -111,6 +111,7 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
                                'main': False,
                                'mutable': False,
                                'uid': None,
+                               'role': 'master',
                                'sigkey': None,
                                'prikey': None}},
             }
@@ -130,9 +131,15 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
 
         do salt raet road stack setup at enter
         '''
-        name = self.opts.value.get('id', self.local.data.name)
+        #import  wingdbstub
+
+        role = self.opts.value.get('id', self.local.data.role)
         sigkey = self.local.data.sigkey
         prikey = self.local.data.prikey
+        #name = self.opts.value.get('id', self.local.data.name)
+        #name = LocalEstate.nameGuid(prefix='road') # name is  guid
+        #name = 'stack_' +  role
+        name = role
         main = self.opts.value.get('raet_main', self.local.data.main)
         mutable = self.opts.value.get('raet_mutable', self.local.data.mutable)
         always = self.opts.value.get('open_mode', False)
@@ -155,6 +162,7 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
                                      name=name,
                                      uid=uid,
                                      ha=ha,
+                                     role=role,
                                      sigkey=sigkey,
                                      prikey=prikey,
                                      main=main,
diff --git a/salt/daemons/flo/master.flo b/salt/daemons/flo/master.flo
index dd1f0b7814..991a1de56a 100644
--- a/salt/daemons/flo/master.flo
+++ b/salt/daemons/flo/master.flo
@@ -2,7 +2,7 @@
 
 house master
 
-init .raet.udp.stack.local to main true name "master"
+init .raet.udp.stack.local to main true name "master" role "master"
 
 init .salt.uxd.stack.local to yid 0 name "master" lanename "master"
 
diff --git a/salt/daemons/flo/minion.flo b/salt/daemons/flo/minion.flo
index 79b21a9267..e4149dd25f 100644
--- a/salt/daemons/flo/minion.flo
+++ b/salt/daemons/flo/minion.flo
@@ -2,7 +2,8 @@
 
 house minion
 
-init name in .raet.udp.stack.local from value in .salt.etc.id
+# init name in .raet.udp.stack.local from value in .salt.etc.id
+init role in .raet.udp.stack.local from value in .salt.etc.id
 
 init .salt.uxd.stack.local to yid 0 name "minion" lanename "minion"