Refactor service names to not use word service