renaming 'callbacks' to 'events', adjusting tests