Updated map event function names to be more specific to maps