Base endpoint definition

Fixes #461
Yeah, let's change it there too. Cleaner terminology.