Mailing service name refactoring