Renaming of some options