Updating mixins for consistency.
Merge pull request #15 from Brightspace/dbatiste/consistency

Updating mixins for consistency.