Fix watcher name