Use proper Service terminology consistently.