Add more Event name tests, make method private.
Refactor Event names where applicable.