Improve event naming