Change variable names
Refactoring mixins