A few more renames due to the UserEvent -> IMEvent change