Refactor abstract service names