Rename event macros to look like regular functions.