Use endpoint name by default
Merge pull request #400 from markewallace/FixBaseService

Use endpoint name by default