Interrupt macros renamed to be more consistent with the current naming scheme.