Event names normalize

Reissued pull request with updates from master. For #226.