refactor event names, deprecate old ones

Closes #8
Release v2.6.0-beta