Rename options

closes #82