splitting human friendly and gateway name identification.
Merge branch 'multi-hub' into hydro-devel
more clear on what the namespace is here.