Watchers: Use correct case mapping