Renamed 'watchdogs' to 'singletons'