Use better names for some event MFAs