Refs #404 - Rename watcher in service

Also add a deprecation warning if people still use service.

Refs #402