Changed the static variables in MapToEvent to final variables, and
adjusted their names to be in all caps. Fixed any bugs this created.