Generic way to get the right endpoint name

Avoiding the need to override methods from Model
Vresion bump