Small refactor on service names