Rename _watcher to watcher