updated mixin names