rename acceptable to choices
prep for 1.0a2