Fix errors caused by namespaced enums

Fixes #5.
Simplify Event variant names