Rename mixins to use herow name