[Release-team] Service name cleanup [was Re: IRIS testing needed]