what about replacing *_watcher_names by *_wn to shorten/simplify the code?