fix mixin names