re-rename option and fix