Rename mixins and classes (major BC break)