rename mixins and update readme and comments