Change serviceId's to correct format