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

Updating mixin names.