rename mixins
improve docs