Make interrupt.h names more regular.