Fixed problems with service names 2