Updating mixin names.
Merge pull request #14 from Brightspace/dbatiste/consistency

Updating mixin names.