fix mixins/events naming