Change mixin name; clean up a few things