Updated underscores for dashes in mixins