Minor refactoring, changing methods names to use 'token' instead of 'event' (to keep terminology consistent)

3 files changed