adjusted service names