change mixin names to ensure all begin with "model" for consistency
prepare for release