Refactoring mixins and naming