refactor: Rename convenience mixins

Rename convenience mixins so that they are more compact. Closes #1