Naming consistency on events