Refs #404 - Rename watcher in service and add a deprecation warning in case of people using service