Update service variable names to include Service for easier understanding