updated mixin names
Merge branch 'release/v0.3.2'