Use machine name instead if ip address when constructing the instantiator ID
Updates for handling service UIs