made mixins names generic