Fixes minor issues with service names