Switch to name-based API instead of IDs

Not really sure if I want to keep the ID. The only value it provides
right now is is it differentiates NewWatch from EWatch.