Another attempt at resoving service name problems