Adjusted service names