rename an option and fix another