Properly namespace events

See #224