Use service name instead of api name to describe endpoint

This PR fixes endpoints models by using service name instead of api name.