Solved some naming discrepancies in event names