renaming things from Watcher to Guard