Add basic name watching