Rename mixins, fix rest of __table_args__