small changes to update to new service names