change service name accoring to new changes

Change-Id: Ia8fcb5b2dec01e1566f13eaf388c81c09688ce17