PIM-1544 : Update service names