Updated service names to be more readable