Rename options, fix calls with one argument.