Rename constants -> choices