updated to use new service names