Refactored event references to use existing field architecture.