Followup on renaming Queue->Service