Added ability to rename choices.