Fix variable names and mixins.